9ee4347965
conflicts? apparently?
2018-10-10 18:53:22 +01:00
f23b3ae178
Merge pull request #9793 from Citinited/emag-locker-fix
...
Removes redundancy in emagged locker description
2018-10-10 08:02:32 +08:00
8b5df00759
Removes recundancy in emagged locker description
2018-10-09 21:46:38 +01:00
8111331094
Replaced code with procs, added return values.
2018-10-09 16:21:11 +02:00
c2bf480622
Merge pull request #9631 from Birdtalon/ERT-changes
...
Gamma ERT Changes
2018-10-09 08:58:15 +08:00
4d7dd5a6c9
dayum dats defined
2018-10-08 22:48:00 +01:00
916e0d9a72
Merge pull request #9415 from variableundefined/SpeshulGunlog
...
Minor attack log overhaul
2018-10-08 01:16:21 -07:00
c068680651
Merge pull request #9658 from variableundefined/DunGoofGrille
...
Change grille cooldown to 1 second instead
2018-10-08 01:08:19 -07:00
bc4a042d57
Merge pull request #9546 from SamHPurp/oh-come-on,-who-throws-a-baton,-i-mean-really
...
Thrown Stunbatons have a low chance to stun
2018-10-08 15:06:54 +08:00
042d24520e
Merge pull request #9724 from SamHPurp/plasma-window-spawners
...
Adds plasma window spawners
2018-10-08 12:20:20 +08:00
3db4229918
First big chunk of the refactor
...
mid-refactor of `take_overall_damage`
Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs
Allows the dead to examine
Removes the `blinded` var
Refactor cyborg components so vision loss is instant
Robot life/death updates instantly
Adds instant updates for damage overlays and HUD icons for humans
Final reconciliation with the species refactor
Adds a stat debugging system and debugging logs
Also fixes instant death on species change
"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would
I used it to fix people dying instantly when changing species due to
temporary deletion of the brain
Fox's requests
Adds a more careful updating system to our reagents system
2018-10-07 17:52:04 -07:00
074ee967e5
Merge branch 'master' into ERT-changes
2018-10-07 19:22:10 +01:00
4151487c98
bugfixes
2018-10-07 18:49:48 +01:00
b28527f992
Merge branch 'master' into dirt-smoothing
2018-10-07 17:16:54 +01:00
988beeb462
Merge pull request #9730 from SamHPurp/decal-tidy-up
...
Refactors decals
2018-10-07 23:09:05 +08:00
3c98bf5799
Merge pull request #9710 from SamHPurp/de-specifying
...
Reduces incorrect use of station names.
2018-10-07 22:52:27 +08:00
eeed299b86
tidyup
2018-10-07 12:43:37 +01:00
d4d340ddf8
Merge pull request #9721 from SamHPurp/damnit-chairs
...
Fixes incorrect chair assignment
2018-10-06 16:50:21 -07:00
3411d92642
adds the plasma window spawners
2018-10-07 00:15:18 +01:00
9912529ab7
Grammar Fix
...
"a meat spike" resulted in weird stuff like "a meat spike is hit by the laser!"
2018-10-06 15:39:04 -07:00
50c393f78a
missed a chair declaration
2018-10-06 22:53:34 +01:00
b9d2f0a915
Revert this commit when using subsystem.
2018-10-06 21:54:38 +01:00
a472eee850
dirt smoothing
2018-10-06 19:22:20 +01:00
3b50aad95d
oh lets not pick up wheelchairs either
2018-10-06 16:47:06 +01:00
63dfd411aa
Resolved merge conflicts... I hope.
2018-10-06 16:01:34 +01:00
ea74920535
no no no no cyberiaaaaad
2018-10-05 20:57:41 +01:00
9d2c4d1438
boring fix
2018-10-04 14:15:34 +01:00
f877e6b90f
adds sprite for T4
2018-10-03 22:20:05 +01:00
b145e722ee
Merge pull request #9611 from SamHPurp/damaged-tile-overlays
...
Tiles now overlay damage & scorch
2018-10-01 16:21:29 +08:00
69209eb847
Change grille cooldown to 1 second instead
2018-10-01 09:01:48 +08:00
ec3d7379f0
Adds Grille Cooldown
2018-09-30 16:42:22 -07:00
d5196b66fd
this should work...
2018-09-30 23:25:45 +01:00
970d56b96c
adds turf damage/scorch landmarks
2018-09-30 23:13:01 +01:00
0ad8a2b2de
Makes weapons that deal no damage unable to ignite plasma statues
2018-09-30 16:44:00 +02:00
1628467857
Merge branch 'master' into ERT-changes
...
# Conflicts:
# icons/mob/head.dmi
2018-09-30 14:53:32 +01:00
c72561d194
addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines
2018-09-29 20:29:26 +01:00
6cb07cb70c
Fixes a bunch of shown messages
2018-09-29 19:10:10 +01:00
c82cd93a89
Merge branch 'master' into Refactors-beds-stools-chairs
2018-09-29 15:36:27 +01:00
68c35ccced
Merge pull request #9527 from Ty-Omaha/muh-art
...
Fixes half the server crashing, removes canvases
2018-09-29 07:49:30 +08:00
deec79982e
adds paranormal loadouts, alters ERT survival kit box, updates PDW 9 sprite, adds paranormal armour variants.
2018-09-28 19:22:55 +01:00
fdc7297954
Reveal speaker identity when using megaphone
2018-09-27 20:36:13 -07:00
c187559e83
Merge pull request #9599 from Agameofscones/lipstickcodefix
...
Jade lipstick color fix (and minor refactor)
2018-09-27 17:48:15 -04:00
d426ed1879
Adds comments and loadout
2018-09-27 14:17:32 -07:00
b9adf71445
Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled
...
Updates use_power to use the Defines
2018-09-27 21:47:04 +08:00
59fba23456
Merge pull request #9524 from alex-gh/autopsy_time_fix
...
Autopsy scanner now prints all times in human readable format.
2018-09-26 21:36:23 -07:00
4991d152af
Merge pull request #8811 from FalseIncarnate/kitchen
...
Mixing Bowls and Kitchen refactors
2018-09-26 17:32:39 -07:00
ae68d43d46
Merge pull request #9032 from Anasari/CabinetDecon
...
Allow you to construct & deconstruct fire extinguisher cabinet
2018-09-26 17:31:15 -07:00
f863b792bd
Merge pull request #9601 from variableundefined/DropLocation
...
Adds in drop_location & AllowDrop()
2018-09-26 17:00:11 -07:00
d3505ea9b9
Merge pull request #9543 from nicetoolbox/changeling-grab-fix
...
Fix changeling tentacle grab
2018-09-26 16:25:25 -07:00
3e4c7b476b
I have no idea how this works
2018-09-24 23:06:21 -07:00
Purpose