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

12211 Commits

Author SHA1 Message Date
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
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
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
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
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
f7c9b1cd32 Merge pull request #8066 from Citadel-Station-13/kevinz000-patch-23 
Fixes the panic bunker
 2019-03-08 20:43:42 -05:00
deathride58
2cd9c69ed1 Merge pull request #8083 from Poojawa/patch-3 
Fixes genital-less VR people
 2019-03-08 20:43:25 -05:00
Amatsu Darkfyre
54a9b3206f Updates in response to feedback from Bhijn. Also adding in missed icons from my first sweep and renamed _corecross.dm to __corecross.dm. 2019-03-08 17:22:40 -05:00
Coolgat3
af04b72476 Making secberets protect as much as helmets 2019-03-08 17:36:46 +01:00
Amatsu Darkfyre
575c7ebeba Adds Chilling effects to Slime Crossbreeding, along with their icons and proper DM files. Nothing is modularized, as this is all content from upstream, so there should be no upstream conflicts when or if a sync occurs. 2019-03-08 04:02:21 -05:00
Trilbyspaceclone
bda18c0770 Update extinguisher.dm 2019-03-06 20:32:40 -05:00
Trilbyspaceclone
7c79484784 Update extinguisher.dm 2019-03-06 20:05:53 -05:00
Trilbyspaceclone
fdad1c30be ? 2019-03-06 17:05:54 -05:00
Trilbyspaceclone
371a4a1a9e Maybe 2019-03-06 16:45:47 -05:00
Trilbyspaceclone
8a5b4414a3 Update extinguisher.dm 2019-03-05 16:37:22 -05:00
nik707
a89ab006c1 Adds new and immersive sound for combat 
Dink!
 2019-03-05 15:03:08 -06:00
Trilbyspaceclone
1228bb4b11 Update extinguisher.dm 2019-03-05 15:37:27 -05:00
Trilbyspaceclone
a0b38d0ed7 Update extinguisher.dm 2019-03-05 03:34:38 -05:00
Trilbyspaceclone
33213b0099 Update kinetic_crusher.dm 2019-03-05 01:06:16 -05:00
Trilbyspaceclone
8f02bf0357 Oh I did a goof 2019-03-05 00:33:53 -05:00