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

9545 Commits

Author SHA1 Message Date
Trilbyspaceclone
f43bd91072 Merge branch 'master' into A_Tailer's_art 2019-10-05 11:50:12 -04: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
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
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
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
TrilbySpaceClone
3f893195bf tested! 2019-09-30 11:42:07 -04: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
Linzolle
0d3a2cdd57 cultist check 2019-09-27 19:15:19 -05:00
Ghommie
ce02f712ba tested. 2019-09-27 17:59:26 +02:00
Fermi
3f7c657111 Plate and pH (pHlate) 2019-09-27 12:01:03 +01:00
Fermi
146219edf9 Merge branch 'master' into beakerpH_tweaks 2019-09-27 11:50:31 +01:00
nik707
3f1f234686 Merge pull request #9170 from Trilbyspaceclone/more_cooking2 
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
 2019-09-26 23:54:17 -05:00
kevinz000
436e01ed0e Merge pull request #9335 from Raptorizer/Guardian_Parasite_Buffs 
Guardian/Holoparasite Buffs
 2019-09-26 19:33:25 -07:00
kevinz000
06eb6e1537 Merge pull request #9318 from Thalpy/clingy-Chems 
[Fix] Fixes small residues of chems sitting in holders without breaking slow reactions.
 2019-09-26 19:31:58 -07:00
kevinz000
35237066b8 Merge pull request #9341 from Ghommie/Ghommie-cit206 
Blood cult altar, forge and archives now use radial menus.
 2019-09-26 19:31:36 -07:00
kevinz000
428a34d0f4 Merge pull request #9348 from Ghommie/Ghommie-cit209 
Reduces holy water message spam for blood/clock cultists.
 2019-09-26 19:31:01 -07:00
deathride58
d0840074b5 PER MINUTE 2019-09-26 13:44:56 -04:00
deathride58
b3cd0859cd Rad collector tweaks - Makes point production use all stored power every process cycle, clears up examine text, makes the gas touching more obvious 2019-09-26 13:39:47 -04:00
TrilbySpaceClone
41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
JTGSZ
5b3f6dca29 Species Job Check 2019-09-23 23:58:57 -04:00
Ghommie
274fdf8c06 return. 2019-09-24 01:40:48 +02:00
Ghommie
5a822d95a4 M to L 2019-09-23 18:20:45 +02:00