Commit Graph

19732 Commits

Author SHA1 Message Date
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
kevinz000
ce473dad9c Update shuttle.dm 2019-03-17 22:15:41 -07:00
CitadelStationBot
f70966f8e2 Automatic changelog generation for PR #8108 [ci skip] 2019-03-16 17:54:01 -05:00
kevinz000
a2d29844d9 Merge pull request #8108 from Ghommie/Ghommie-cit10
Gives space pirates stronger bones.
2019-03-16 15:53:59 -07: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
CitadelStationBot
5528a45125 Automatic changelog generation for PR #8119 [ci skip] 2019-03-16 17:53:22 -05: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
CitadelStationBot
5be54a8897 Automatic changelog generation for PR #8121 [ci skip] 2019-03-16 17:53:10 -05:00
kevinz000
459af1f124 Merge pull request #8121 from deathride58/fixesconversions
Makes conversions mute victims that are deciding their fate, fixes conversions requiring three culties for refusal to cause a sacrifice
2019-03-16 15:53:08 -07:00
kevinz000
ff26b92564 Merge pull request #8112 from Ragolution/First-Aid-Icon-Update
Fixes Radiation Closet Anti-Radiation Kit Icon (Thanks Flechercap.)
2019-03-16 15:52:49 -07: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
CitadelStationBot
ccca2ac8a8 Automatic changelog generation for PR #8114 [ci skip] 2019-03-14 17:10:40 -05:00
nik707
c21fbedeca Merge pull request #8114 from izzyinbox/timegate-fix
speedmerging as this is a nonbalance change requested by headmins.
2019-03-14 17:10:38 -05:00
Ragolution
67f25f2721 Additional methods.
Requested by nicc
2019-03-14 18:02:29 -04:00
izzy
8bf81919c8 reduce minimal player age for command jobs 2019-03-14 16:46:30 -05: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
890a23df52 Github client is shit.
Ooga
2019-03-14 00:16:11 -04:00
Ragolution
8cc589b069 Actually fixes the thing.
Turns out this was 100% easier to fix than I thought.
2019-03-14 00:03:37 -04:00
Ragolution
1fea681ea4 Revert "Update firstaid.dm"
This reverts commit fddbbce94e.
2019-03-13 23:54:44 -04:00
Ragolution
fddbbce94e Update firstaid.dm
Amends erroneous icon_states and adds functionality to medkits to pick one of the random striped/color patterns.

Hope it doesn't break anything.
2019-03-13 22:26:38 -04:00
nik707
896e03f568 Merge pull request #8110 from Ragolution/master
Revert "Merge pull request #8089 from Trilbyspaceclone/patch-70"
2019-03-13 14:11:06 -05: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
CitadelStationBot
9f63d13d82 Automatic changelog generation for PR #8104 [ci skip] 2019-03-12 02:30:27 -05:00
kevinz000
98cdaf38cb Merge pull request #8104 from Ghommie/Ghommie-cit9
Chemical Patches fix.
2019-03-12 00:30:24 -07:00
Ghommie
0e8f356610 Milk. 2019-03-11 11:54:40 +01:00
Amatsu Darkfyre
aedadb30a5 Fixes a difference between /tg/ and Citadel that made extracts uninjectable. 2019-03-10 23:54:45 -04:00
CitadelStationBot
8625d1cad5 Automatic changelog generation for PR #8090 [ci skip] 2019-03-10 15:51:46 -05: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
CitadelStationBot
2ca75aabe2 Automatic changelog generation for PR #8056 [ci skip] 2019-03-10 15:48:44 -05: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
CitadelStationBot
986e4e893f Automatic changelog generation for PR #8084 [ci skip] 2019-03-10 15:44:35 -05: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
CitadelStationBot
7b3e6c570a Automatic changelog generation for PR #8070 [ci skip] 2019-03-10 15:44:22 -05: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
CitadelStationBot
7a606fadc4 Automatic changelog generation for PR #8091 [ci skip] 2019-03-10 15:43:23 -05: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
CitadelStationBot
23d5d38017 Automatic changelog generation for PR #8058 [ci skip] 2019-03-10 15:43:06 -05: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
CitadelStationBot
598dee6440 Automatic changelog generation for PR #8098 [ci skip] 2019-03-10 15:42:46 -05: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
1929c6bbb6 Update weapon_designs.dm 2019-03-09 20:37:06 -05:00
Trilbyspaceclone
137fec5d28 Update weapon_designs.dm 2019-03-09 20:36:44 -05:00