Commit Graph

19708 Commits

Author SHA1 Message Date
Ragolution
f7807ceb73 Hmm... 2019-03-20 01:14:43 -04:00
Ragolution
0b459ad06f Fixes 200,000 runtimes during scrubber event
thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz
2019-03-20 00:35:42 -04:00
Ragolution
81ba8ff40b Update vent_clog.dm
Works locally, like this. Fuck if I know.
2019-03-19 23:55:37 -04: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
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
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
Trilbyspaceclone
538e64b9e9 oops 2019-03-09 20:13:47 -05:00
Trilbyspaceclone
ce7c76e8a4 ? 2019-03-09 20:12:44 -05:00
Trilbyspaceclone
8f9542bc43 Update automatic.dm 2019-03-09 20:05:07 -05:00
Trilbyspaceclone
beb812e291 Update packs.dm 2019-03-09 20:03:40 -05:00
Trilbyspaceclone
979f9125ef Update weapon_designs.dm 2019-03-09 19:54:48 -05:00
Trilbyspaceclone
ca4ea1d4e4 Update weapon_designs.dm 2019-03-09 19:45:52 -05:00
Trilbyspaceclone
54a3bde375 Update weapon_designs.dm 2019-03-09 19:45:30 -05:00
Coolgat3
45a4693618 Update helmet.dm 2019-03-09 16:42:27 +01:00
Coolgat3
eb786cbfde Update jobs.dm 2019-03-09 16:39:51 +01:00
deathride58
5e6395270b Merge pull request #7889 from Citadel-Station-13/kevinz000-patch-7
Reworks meth
2019-03-08 21:05:20 -05:00
deathride58
d9df0c1f76 Merge pull request #8093 from Trilbyspaceclone/patch-74
[Ready] Makes Fire extinguisher slip need a screwdriver - Frack & Spensara Request Middle ground by Bhijn
2019-03-08 20:54:21 -05:00
deathride58
c2acda5a96 Merge pull request #8073 from Citadel-Station-13/kevinz000-patch-27
bunker bypass now sanitizes ckeys automatically to avoid errors
2019-03-08 20:51:15 -05:00
deathride58
2ae75ccd21 Merge pull request #8078 from Citadel-Station-13/kevinz000-patch-29
Fixes SDQL2 list association recursing/printing
2019-03-08 20:50:50 -05:00
deathride58
e5f5520393 Merge pull request #8075 from BlackMajor/master
More borg sprites
2019-03-08 20:50:33 -05:00
deathride58
aac192752f Merge pull request #8088 from Trilbyspaceclone/patch-69
[MIRROR] - Candle cleanup and fixes #42968
2019-03-08 20:50:13 -05:00
deathride58
6ed81162b3 Merge pull request #8089 from Trilbyspaceclone/patch-70
[MIRROR] - P.A.C.M.A.N code cleaning #42891
2019-03-08 20:49:38 -05:00
deathride58
6aaee476c8 Merge pull request #8079 from Citadel-Station-13/kevinz000-patch-30
Adds wrapper list access index for SDQL2
2019-03-08 20:49:18 -05:00
deathride58
3b3fcb5d19 Merge pull request #8094 from Trilbyspaceclone/patch-75
[MIRROR] Watcher's Wing No Longer Perma-Disarms #41708
2019-03-08 20:48:40 -05:00
deathride58
5aa9dd7c14 Merge pull request #8092 from Trilbyspaceclone/patch-71
More miner point cards
2019-03-08 20:46:57 -05:00
deathride58
df1decf1b1 Merge pull request #8087 from Trilbyspaceclone/QoL-RCD
[MIRROR]  fixes some edge cases in rcd building #42960 TG code
2019-03-08 20:46:19 -05:00
deathride58
1f3821d443 Merge pull request #8082 from Poojawa/patch-2
Removes Mime insulting
2019-03-08 20:45:02 -05:00