shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,781 Commits 5 Branches 0 Tags
ddc8bfbfb7578a2fc92ca9a2e808f05561c6070f
Commit Graph

7470 Commits

Author SHA1 Message Date
Trilbyspaceclone
ddc8bfbfb7 Update machine_vending.dm 2019-03-21 17:33:23 -04:00
Trilbyspaceclone
c5dfc6f8cf Update machine_vending.dm 2019-03-21 17:14:16 -04:00
Trilbyspaceclone
5d34c7ef6e Update machine_vending.dm 2019-03-21 16:34:18 -04:00
Trilbyspaceclone
94a905f420 Update machine_vending.dm 2019-03-21 16:15:30 -04:00
Trilbyspaceclone
e2497cdcf5 Update machine_vending.dm 2019-03-21 16:07:27 -04:00
Trilbyspaceclone
4b42443dea Update machine_vending.dm 2019-03-21 16:04:35 -04:00
deathride58
974420eb5a Merge pull request #8150 from Trilbyspaceclone/patch-84 
MIRROR - Fixes runtime from attempting checking armor on missing bodypart, improves ran_zone selection mechanism #43222
 2019-03-21 15:33:34 -04:00
deathride58
e49ef21298 Merge pull request #7984 from Citadel-Station-13/kevinz000-patch-19 
Monkey cubes are now baymed tiers of lethal if you eat them raw as a carbon based lifeform.
 2019-03-21 15:23:28 -04:00
deathride58
e1496198e4 Merge pull request #8125 from Trilbyspaceclone/Pizza 
Anomaly pizza crafting
 2019-03-21 15:11:43 -04:00
deathride58
4d64dcd5b9 Merge pull request #8130 from Poojawa/mystery-flavors 
Flavor Text is hidden if your face is obscured
 2019-03-21 15:10:57 -04:00
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
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
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
Poojawa
25d079c4b8 Fixes blood overlay and shield issues for taurs 2019-03-18 03:19:18 -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
36119e007d Properly fixes igniters by increasing the max hotspot expose temperature of sparks to 700 2019-03-15 16:49:10 -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
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
Amatsu Darkfyre
2d286e525d Changes Adamantine Suit's armor values to not be bad. 
Also recolors the Slime Mask so it's more obvious at a glance what it is.
 2019-03-10 15:10:07 -04:00
Ghommie
27efffb74c 1 2019-03-10 15:28:05 +01:00
Trilbyspaceclone
5197c0fb94 Update weapon_designs.dm 2019-03-09 20:34:39 -05:00
Trilbyspaceclone
8b99ca8094 Update packs.dm 2019-03-09 20:31:00 -05:00
Trilbyspaceclone
5aa5f1ed56 SMG 2019-03-09 20:29:19 -05:00