shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,048 Commits 5 Branches 0 Tags
4538c43ededb4fa2decd69a8dd5d5cc1c2b30b01
Commit Graph

9587 Commits

Author SHA1 Message Date
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port 
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
 2019-10-07 23:29:19 -07:00
nik707
6803338df2 Merge pull request #9384 from jakeramsay007/Moar-Bugfixes 
Fixes the Trek uniform/suit sprites
 2019-10-07 18:19:59 -05:00
kevinz000
dd46509597 Merge pull request #9377 from Thalpy/Fixes_melting_grenades 
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
 2019-10-06 21:37:50 -07:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
kevinz000
356755d710 Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE 
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
 2019-10-05 08:26:40 -07:00
kevinz000
22f9c9f711 Merge pull request #9401 from Poojawa/patch-2 
APC UI autoupdates properly
 2019-10-05 08:23:22 -07:00
kevinz000
b691da0bca Merge pull request #9407 from Poojawa/cryo-qol 
Adds Cryo QoL with hotkeys
 2019-10-05 08:22:01 -07:00
Poojawa
9c4a808e7e Adds Cryo QoL with hotkeys 
Ctrl click to swap power, Alt click to close/open machine. This is how you do a "QoL" PR.
 2019-10-03 23:14:46 -05:00
Fermi
7f74a98372 .9 2019-10-04 04:55:36 +01:00
Fermi
62737884f0 lye was 13 oops 2019-10-04 04:55:16 +01:00
Fermi
79e85e2cfa Fixes some runtimes 2019-10-04 03:53:02 +01:00
Fermi
10f5fc3b47 Buffer fix 2019-10-04 03:22:53 +01:00
deathride58
2058cbd09f Merge pull request #9390 from Ghommie/Ghommie_cit212 
Ensuring altdisarm() works as intended.
 2019-10-03 20:16:05 -04:00
deathride58
6e9a2553af Merge pull request #9393 from jakeramsay007/Even-More-Bugfixes 
Fixes AIs being unable to talk through holopads
 2019-10-03 20:12:59 -04:00
Poojawa
a8e16ce27e APC UI autoupdates properly 2019-10-03 14:00:17 -05:00
BlackMajor
02f0e4dd84 Ghosts stop stealing my paper work 2019-10-03 19:16:00 +13:00
Chayse Ramsay
8cbd7d6c06 Fixes AIs being unable to talk through holopads 2019-10-02 21:14:11 +01:00
Ghommie
4855474955 Making sure altdisarm() works as intended. 2019-10-02 19:39:23 +02:00
Chayse Ramsay
68ca8a5ac0 whoops 2019-10-02 11:55:38 +01:00
kevinz000
1aac0942e9 Merge pull request #9373 from Trilbyspaceclone/beepalm 
Beebalm and Honeybalm plants
 2019-10-02 00:02:05 -07:00
kevinz000
a177e5a457 Merge pull request #9364 from Ghommie/Ghommie-cit206 
Fixing the blood cult radial menu unholy flask option's icon.
 2019-10-01 23:59:49 -07:00
Chayse Ramsay
5c827ed8ed Fixes the Trek uniform/suit sprites 
Not having mutant additions was causing the update_icons code to null out the alternate_worn_icon variable
 2019-10-02 04:08:25 +01:00
Ghommie
81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00
Ghommie
d2300765b2 adjacency checks. 2019-10-01 23:16:47 +02:00
Ghommie
cfcd325778 reworking the shoving people action. 2019-10-01 23:13:08 +02:00
Ghommie
340f8498a3 Fixes some more issues with shoving people. 2019-10-01 22:11:41 +02:00
kevinz000
250c6ed986 Merge pull request #9367 from Poojawa/totally-radical 
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
 2019-10-01 00:12:32 -07:00
Fermi
2bbcc7f660 Fixes them sneaky nades 2019-10-01 06:48:15 +01:00
Fermi
553818504c Hoepfully fixes unwanted traumas in the dead. 2019-10-01 06:21:34 +01:00
Fermi
89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
TrilbySpaceClone
3f893195bf tested! 2019-09-30 11:42:07 -04:00
Fermi
0762ed5265 oops, but also this shouldn't be able to be made. 2019-09-29 20:25:00 +01:00
Fermi
f83de63124 Kev's scanner malarky 2019-09-28 17:51:55 +01:00
Poojawa
9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags 
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
 2019-09-28 03:22:17 -05:00
kevinz000
6e55fec7bd Merge pull request #9189 from Sishen1542/gatling 
[READY] craftable laser minigun, because why not
 2019-09-28 00:40:02 -07:00
kevinz000
0febc1977a Merge pull request #9191 from Linzolle/fireman 
Ports fireman carrying from /tg/
 2019-09-28 00:38:08 -07:00
kevinz000
7c3036f027 Merge pull request #9267 from Tupinambis/EngineeringCriticalFix 
Gives the Endivend Upgraded RCDs by default, instead of Autolathe ones.
 2019-09-28 00:28:43 -07:00
kevinz000
8d9520ee58 Merge pull request #9336 from Thalpy/beakerpH_tweaks 
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
 2019-09-28 00:26:51 -07:00
kevinz000
426104021e Merge pull request #9321 from Linzolle/bloodrites 
some cult fixes + cult qol
 2019-09-28 00:24:15 -07:00
kevinz000
6b33e3bd0b Merge pull request #9322 from Sishen1542/cult 
blood cult conversion no longer requires consent
 2019-09-28 00:23:48 -07:00
kevinz000
cbe6a54531 Merge pull request #9326 from YakumoChen/radioactive-paperweight 
Advanced energy guns glow more
 2019-09-28 00:23:31 -07:00
kevinz000
cc64b8e0a4 Merge pull request #9320 from Ghommie/Ghommie-cit200 
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
 2019-09-28 00:22:13 -07:00
kevinz000
3ce5b318ca Merge pull request #9317 from Ghommie/Ghommie-cit199 
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
 2019-09-28 00:21:47 -07:00
kevinz000
5562db4ed4 Merge pull request #8914 from Ghommie/Ghommie-cit147 
Updating spraycans and crayons.
 2019-09-28 00:20:42 -07:00
kevinz000
b28e65637e Merge pull request #9344 from Ghommie/Ghommie-cit208 
Makes abandoned crates less prone to explosions.
 2019-09-28 00:15:27 -07:00
kevinz000
1b295c8501 Merge pull request #9359 from deathride58/fuckstoredpower 
Rad collector tweaks - Reverts point production to its original behavior, clears up examine text
 2019-09-28 00:14:47 -07:00
Fermi
391af0f946 I have no idea why the brain doesn't decay, but this seems to fix it. 2019-09-28 07:26:59 +01:00
Linzolle
0d3a2cdd57 cultist check 2019-09-27 19:15:19 -05:00
Fermi
d44fbd3fb1 Brain fix 2019-09-27 23:46:44 +01:00