Commit Graph

7677 Commits

Author SHA1 Message Date
deathride58
742a99a44c Merge pull request #8132 from Poojawa/taursuit-fixes
Fixes blood overlay and shield issues for taurs
2019-03-21 15:06:57 -04:00
deathride58
c32c3c0e39 Merge pull request #8137 from Trilbyspaceclone/Tea
Makes strawberry milk and strawberry tea!
2019-03-21 15:04:58 -04:00
Trilbyspaceclone
bf1c8a5e7d LOCAL CAT CANT DO ANYTHING CORRECT 2019-03-20 21:09:40 -04:00
Trilbyspaceclone
978b5261ce Update packs.dm 2019-03-20 20:54:34 -04:00
Ragolution
ee9368cadb why does ghomme help us
is it because he feels bad for us
real deepthink
2019-03-20 20:08:07 -04:00
Trilbyspaceclone
9d15665cbb Update packs.dm 2019-03-20 17:12:05 -04:00
Trilbyspaceclone
d04606acb1 SHIFT CLICK CAT DO THE THING THAT PROPERLY DOSE THE THING 2019-03-20 16:21:45 -04:00
Trilbyspaceclone
c774287e2b Update mob_helpers.dm 2019-03-20 16:06:01 -04:00
Trilbyspaceclone
2931e52777 woops! 2019-03-20 16:02:42 -04:00
Trilbyspaceclone
6667a89a0a Update mob_helpers.dm 2019-03-20 16:02:07 -04:00
Trilbyspaceclone
ef58b35603 Update human_defense.dm 2019-03-20 15:57:14 -04:00
Ragolution
793a8c5c44 QoL naming changes
It's MY CODE NOW, TRILBY. YOU CAN'ST STOPP ME
2019-03-20 01:42:18 -04:00
Ragolution
81ba8ff40b Update vent_clog.dm
Works locally, like this. Fuck if I know.
2019-03-19 23:55:37 -04:00
deathride58
4761d9d7f3 Makes OOC and LOOC actually use different toggles 2019-03-19 20:18:15 -04:00
deathride58
357d90433f Makes panic bunker interactions be logged in IRC 2019-03-19 19:43:36 -04:00
deathride58
09f77d0438 Nerfs dinks - Ballistic projectiles are now the only projectiles that can emit a dink 2019-03-18 23:02:07 -04:00
Trilbyspaceclone
4699d83801 the icons damn it! 2019-03-18 20:24:57 -04:00
Trilbyspaceclone
c321e44319 Update drink_reagents.dm 2019-03-18 20:20:24 -04:00
Trilbyspaceclone
8d213cb1c6 Update drinks_recipes.dm 2019-03-18 19:45:51 -04:00
Ragolution
7b26e7038a Merge branch 'master' into BadWording 2019-03-18 16:30:01 -04:00
Ragolution
9cb4265675 Improves operation console stuff
Changes confusing wording on Optable console
2019-03-18 16:22:18 -04:00
Poojawa
25d079c4b8 Fixes blood overlay and shield issues for taurs 2019-03-18 03:19:18 -05:00
Poojawa
fb1b76cafe compiles but I don't feel like spriting atm 2019-03-18 02:00:00 -05:00
nik707
19a674ab1f Merge pull request #8122 from deathride58/fixesheadstamloss
Fixes staminaloss targeted at the head not redirecting to the chest
2019-03-18 00:30:37 -05:00
Poojawa
abc0936256 hide flavors 2019-03-17 05:00:14 -05:00
kevinz000
4a2165f198 Merge pull request #8113 from Ragolution/Abductor-Advanced-Surgery
Allows Abductors to revive their dead agent, granted they recover the body.
2019-03-16 15:53:39 -07:00
kevinz000
8151d504c6 Merge pull request #8119 from deathride58/properlyfixesigniters
Properly fixes igniters by increasing the max hotspot expose temperature for sparks to 700 from 300
2019-03-16 15:53:20 -07:00
Trilbyspaceclone
44d4c177e2 Merge branch 'master' into Pizza 2019-03-16 17:53:52 -04:00
Trilbyspaceclone
45a0fc856e Update snacks_pizza.dm 2019-03-16 17:46:38 -04:00
Trilbyspaceclone
f88de367ed Update recipes_pizza.dm 2019-03-16 13:26:45 -04:00
Trilbyspaceclone
9408fd8daf Update recipes_pizza.dm 2019-03-16 12:58:49 -04:00
deathride58
9d711370d4 Fixes staminaloss not redirecting to the chest when attempting to apply to the head 2019-03-15 20:09:34 -04:00
deathride58
78472039cf i hit ctrl s god fucking damnit 2019-03-15 19:47:02 -04:00
deathride58
4bc0833982 Makes conversions mute victims that are deciding their fate, fixes conversions requiring three cultists to sacrifice a refusing victim 2019-03-15 19:43:24 -04:00
deathride58
95c975078c fixes travis 2019-03-15 19:22:28 -04:00
deathride58
36119e007d Properly fixes igniters by increasing the max hotspot expose temperature of sparks to 700 2019-03-15 16:49:10 -04:00
deathride58
e4c5f005a0 makes DNR apply properly to ghost roles and midround antags 2019-03-15 16:26:17 -04:00
Ragolution
67f25f2721 Additional methods.
Requested by nicc
2019-03-14 18:02:29 -04:00
Ragolution
12db99dc01 Update revival.dm
Adds Abductor Science Tool to acceptable implements to revive a dead body.
2019-03-14 13:21:04 -04:00
kevinz000
86ddab31c4 Merge pull request #8107 from AmatsuDF/chillingbugfix
Fixes a difference between /tg/ and Citadel that made extracts uninje…
2019-03-14 04:13:54 -07:00
Ragolution
b0ccfbc1b4 Revert "Merge pull request #8089 from Trilbyspaceclone/patch-70"
This reverts commit 6ed81162b3, reversing
changes made to 6aaee476c8.
2019-03-12 14:28:54 -04:00
kevinz000
98cdaf38cb Merge pull request #8104 from Ghommie/Ghommie-cit9
Chemical Patches fix.
2019-03-12 00:30:24 -07:00
Amatsu Darkfyre
aedadb30a5 Fixes a difference between /tg/ and Citadel that made extracts uninjectable. 2019-03-10 23:54:45 -04:00
Trilbyspaceclone
ec030144d2 Update tiny_prick.dm 2019-03-10 17:03:45 -04:00
kevinz000
821a31afb8 Merge pull request #8090 from deathride58/tgpushes
Replaces disarm right click action with tgstation/tgstation#42958's disarm pushes
2019-03-10 13:51:44 -07:00
kevinz000
b17b2a0a4a Merge pull request #8097 from AmatsuDF/master
Adds Chilling effects to Slime Crossbreeding
2019-03-10 13:50:37 -07:00
kevinz000
698adb7c7d Merge pull request #8056 from deathride58/tegnerf
Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe
2019-03-10 13:48:42 -07:00
kevinz000
d681b30df5 Merge pull request #8102 from Trilbyspaceclone/semi-auto
Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG
2019-03-10 13:44:57 -07:00
kevinz000
4451d8e3ad Merge pull request #8070 from deathride58/consensualcults
Makes bloodcult conversions consensual, similar to Bay.
2019-03-10 13:44:20 -07:00
kevinz000
b143f6f883 Merge pull request #8098 from Coolgat3/patch-2
Equalizes security helmet and beret armor
2019-03-10 13:42:44 -07:00