b5a7c2c19c
Moves how poly tracks his lifetimes out of Write_Memory() to avoid some weird edge cases where poly could be accidentally credited with living while dead.
...
The only in game side effect of this pull is that if poly dies in a round and later is revived somehow his streak will still be broken.
Fixes a spacing error I missed.
Changes the savefile names of the round survival mechanics, as the existing ones are somewhat spoiled by the bug I'm fixing.
2016-02-07 04:21:07 -05:00
1449640867
Merge pull request #15247 from ChangelingRain/revert-15182-complexanimals
...
Revert "Simple animal force threshold no longer converts damage to brute"
2016-02-06 20:32:21 -06:00
90b5a5bfa5
Merge pull request #15154 from AnturK/brig_timers
...
Brig door timer tgui
2016-02-06 23:13:13 -03:00
ed014be6f2
Merge pull request #15183 from Incoming5643/everybodys_heard_about_the_bird
...
Edict from the bird: "I've run out of jokes"
2016-02-06 22:49:06 -03:00
b897507e73
Roll back the shuffle chance for the speech buffer
...
I wasn't aware this code ran every life tick!
2016-02-06 18:53:27 -05:00
7939d069dc
Feeding poly crackers (existing mechanic) will now boost his speak chance permanently
...
Some arbitrary renaming of the new savefile vars
makes what was essentially a prob call a prob call.
2016-02-06 18:50:23 -05:00
86f7b98baf
Revert "Simple animal force threshold no longer converts damage to brute"
2016-02-06 17:25:44 -05:00
95d279a4a4
Removing the true_changeling.dm file that I added by mistake.
...
renamed "nearsight" fullscreen to "nearsighted"
2016-02-06 22:23:13 +01:00
99653ed152
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
...
Conflicts:
code/modules/reagents/chemistry/holder.dm
2016-02-06 20:38:16 +01:00
f00e9588fd
Merge pull request #14992 from KorPhaeron/flashlights
...
Adds laserguns with rechargeable, swappable magazines
2016-02-06 16:36:03 -03:00
20bf41a05d
Fixes fullscreen overlay not appearing on login.
2016-02-06 20:35:43 +01:00
aed7794f50
Made changes to adjust with neersighted's fullscreen overlays pr.
...
Fixed Xray users getting vision impairment overlays when inside a container.
Fixes mob inside mecha getting the mech sight flags despite not being the pilot.
"get_vision_impairments" is renamed to "get_remote_view_fullscreens".
Fixes AI blindness.
2016-02-06 20:35:15 +01:00
4e34ca775e
Merge pull request #15219 from neersighted/reagents_aaaaaaa
...
Speed reagent reaction code
2016-02-06 16:15:50 -03:00
d1f748b09c
comment style is important
2016-02-06 12:15:21 -06:00
7b602a35b5
Merge pull request #15217 from neersighted/flashy
...
Fix flashlights flashing
2016-02-06 14:21:14 -03:00
0dbbcce675
Merge pull request #15216 from KorPhaeron/fixes_bulldogs
...
Fixes bulldogs being unable to load special ammo
2016-02-06 14:19:35 -03:00
fdec37b76f
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
...
Conflicts:
code/_onclick/hud/alien.dm
code/_onclick/hud/alien_larva.dm
code/_onclick/hud/hud.dm
code/_onclick/hud/human.dm
code/_onclick/hud/monkey.dm
code/_onclick/hud/other_mobs.dm
code/_onclick/hud/robot.dm
code/game/machinery/Sleeper.dm
code/modules/mob/living/carbon/alien/larva/death.dm
code/modules/mob/living/carbon/brain/death.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/monkey/death.dm
code/modules/mob/living/death.dm
code/modules/mob/living/life.dm
code/modules/mob/living/silicon/ai/death.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/living/silicon/ai/login.dm
code/modules/mob/living/silicon/pai/death.dm
code/modules/mob/living/silicon/robot/death.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob_defines.dm
2016-02-06 15:42:13 +01:00
eda3c54d9d
Merge pull request #15070 from MMMiracles/instagib
...
Adds an Instagib Rifle
2016-02-06 08:36:06 -03:00
a3dd5ece3f
Brig door timer tgui
...
Remove unneeded require from few templates
2016-02-06 11:51:53 +01:00
159ca02294
Find and replace strikes again
2016-02-06 04:05:03 -06:00
173ad9d331
Merge pull request #15232 from neersighted/tgui
...
Fix shuttles not correctly buying/selling
2016-02-06 02:29:37 -06:00
6f05af73a3
Fix shuttles not correctly buying/selling
...
Empty crates are now sold properly, as well as being sold
only when centcomm is reached
2016-02-06 02:01:38 -06:00
49860a87a3
Early morning coding is bad
2016-02-06 01:01:56 -06:00
f1a8fe786a
Put the vars back; some other speed improvements
...
Apparently . = is not the one true way
;~; @RemieRichards
2016-02-05 18:57:09 -06:00
bb10a81310
Optimize more listmos procs, rename a few vars
2016-02-05 18:56:41 -06:00
7822b1ee75
Lismos speed improvements
2016-02-05 18:55:39 -06:00
b9c79680b9
Rename get_ui_data -> ui_data, remove useless shuffle from wires
2016-02-05 17:09:40 -06:00
14ee8eec08
Fix tank UI for ghosts
...
istype is needed
2016-02-05 17:06:08 -06:00
46fe1f82a5
Factor out filter to be more generic
2016-02-05 17:06:07 -06:00
9386602acf
tgui cargo console
...
rewrite awful shuttle/cargo code a lot as well
2016-02-05 17:06:07 -06:00
fc513f9a47
Add generic "screen" capability to tgui
...
Also fix typo found in uplinks, random uses of 'src'
2016-02-05 17:06:05 -06:00
9783f47514
Centralize shuttle computers
2016-02-05 17:06:04 -06:00
29fdf73cc6
tgui power monitor; linegraph component
2016-02-05 17:06:04 -06:00
c5e6a922ca
Cache canister updates and make huge scrubbers use power; add movable version
2016-02-05 17:06:03 -06:00
796cca2753
tgui scrubbers
...
removes area atmos computer
2016-02-05 17:06:02 -06:00
c9f61fd7da
Rework portable atmos; tgui portable pump
2016-02-05 17:06:00 -06:00
af19bff008
tgui sleepers and uplink search
...
Fix some state logic
Fix SVGs
display: based filtering
input component
Update syndicate colors
@ChangelingRain
2016-02-05 17:05:59 -06:00
302a02aa88
istypeless meme
...
@RemieRichards
2016-02-05 14:29:53 -06:00
1e8ca7193c
Speed reagent reaction code
2016-02-05 12:36:35 -06:00
2f6c9ec50e
Bulldog Fix
2016-02-05 12:06:53 -06:00
289f0c19e1
Fix flashlights flashing
2016-02-05 12:06:44 -06:00
6154334fbc
Merge pull request #15201 from KorPhaeron/turret_fixes
...
Fixes AI core turrets shooting at pingsky
2016-02-05 14:58:38 -03:00
01b1ed7cc0
Merge pull request #15193 from xxalpha/putin
...
Fixes var edited SMES starting with no charge.
2016-02-05 14:56:53 -03:00
0f38d829b5
Merge pull request #15191 from KorPhaeron/chaplain
...
Theatre Access for Chaplain
2016-02-05 14:54:15 -03:00
d188447041
Merge pull request #15121 from neersighted/hotkeys
...
Add hotkey preferences
2016-02-05 14:52:34 -03:00
10f725d216
Merge pull request #15119 from lordpidey/pipe_suicide
...
Added a new suicide act for pipe valves.
2016-02-05 15:53:24 +00:00
a129b1fdaf
Merge pull request #15182 from ChangelingRain/complexanimals
...
Simple animal force threshold no longer converts damage to brute
2016-02-05 01:03:21 -03:00
70a69ae1e7
Merge pull request #15141 from KorPhaeron/practice
...
Makes practice lasers scarier
2016-02-05 00:58:16 -03:00
b3daf4be22
Merge pull request #14981 from neersighted/510
...
BYOND 510
2016-02-05 00:04:59 -03:00
ac03d5f617
Fix flashlights actually stunning
...
Also make clear_fullscreen() waitfor = 0 to be safe,
and bump travis version
2016-02-04 20:50:26 -06:00
Incoming
Cheridan
tkdrg
Incoming5643
Nerd Lord
phil235
phil235
Bjorn Neergaard
AnturK
KorPhaeron
Remie Richards