shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

14703 Commits

Author SHA1 Message Date
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
Ragolution
b874662323 Enables new sound. 
Why the fuck is this in the ticker subsystem?
 2019-03-18 08:54:04 -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
kevinz000
461d42ae6b Update ticker.dm 2019-03-17 22:18:13 -07:00
kevinz000
39397ea938 Update shuttle.dm 2019-03-17 22:17:30 -07:00
kevinz000
079264bf93 Update communications.dm 2019-03-17 22:16:44 -07: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
kevinz000
5e6e651869 eh fuck it revs can stay 2019-03-16 15:50:42 -07:00
kevinz000
8b3d4c3da1 Update clock_cult.dm 2019-03-16 15:48:28 -07:00
kevinz000
83dbfc2987 Update cult.dm 2019-03-16 15:48:06 -07:00
kevinz000
696625f7b8 Update clock_cult.dm 2019-03-16 15:47:19 -07:00
kevinz000
4fea9d3a65 Update revolution.dm 2019-03-16 15:46:42 -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
Fermi
8e2775bbe3 A few changes (mix edit for Neko) 
MeowMeowMeowMeowMeowMeowMeow
 2019-03-14 03:27:25 +00: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
Fermi
4558110dfb aaaa what did I doooo 
Github pains me greatly
 2019-03-11 18:21:09 +00: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
ac8636e127 Merge pull request #8084 from Poojawa/patch-4 
Removes specific names from clone pod reports
 2019-03-10 13:44:33 -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
7628289ad6 Merge pull request #8091 from deathride58/fixesz1hyperspace 
Fixes centcom zlevel hyperspace acting like normal space (and also fixes the title screen while im at it)
 2019-03-10 13:43:21 -07:00
kevinz000
0652c32c23 Merge pull request #8058 from deathride58/joggingslipresistance 
Makes jogging let you avoid water slips, but only if you have less than 20% staminaloss
 2019-03-10 13:43:05 -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
Trilbyspaceclone
aafbbad2af Update tiny_prick.dm 2019-03-10 13:33:56 -04:00
Trilbyspaceclone
8a3b7d29d3 Update tiny_prick.dm 2019-03-10 13:30:45 -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