Commit Graph

11123 Commits

Author SHA1 Message Date
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
Poojawa
6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05: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
Fermi
257336ae0d Holderrrr 2019-10-04 02:24:02 +01:00
Fermi
d91a35c2b6 Allows reactions at lower temps for Neuro to reduce confusion. 2019-10-04 01:19:56 +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
b589565398 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-03 15:05:26 -05:00
Poojawa
a8e16ce27e APC UI autoupdates properly 2019-10-03 14:00:17 -05:00
Ghommie
a65b4d0b1c hopefully a performance improvement to stop genitalia from having to update everytime. 2019-10-03 19:08:11 +02:00
BlackMajor
02f0e4dd84 Ghosts stop stealing my paper work 2019-10-03 19:16:00 +13:00
Ghommie
8a36c007cd unatomized sin. 2019-10-03 04:38:36 +02:00
Ghommie
6dbac16c74 Sanitizing the fermis code biohazard. 2019-10-03 04:31:11 +02:00
Chayse Ramsay
8cbd7d6c06 Fixes AIs being unable to talk through holopads 2019-10-02 21:14:11 +01:00
Fermi
8686633cc5 Changing branch 2019-10-02 19:35:36 +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
Fermi
b099a01a65 Whats life without colour? 2019-10-02 11:06:00 +01:00
Fermi
797dcfc1e3 ahaha 2019-10-02 10:08:45 +01:00
Seris02
eb3f26545d Merge pull request #3 from Citadel-Station-13/master
Updating my fork on a web browser, oof
2019-10-02 16:11:02 +08:00
Seris02
0f101de5ac Undoing the other one
Because I'm on my web browser doing this and I can't figure out how to revert
2019-10-02 16:05:26 +08:00
kevinz000
6dff5246d4 Update supermatter.dm 2019-10-02 00:12:46 -07: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
Sishen
f3d373a6b8 loose goose
honk honk
2019-10-02 02:27:30 -04:00
Thalpy
72ccc5fe69 Loopzoop 2019-10-02 06:52:01 +01:00
Ghommie
02df68a1cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-02 07:26:09 +02:00
Poojawa
0482973e8f Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 22:38:12 -05: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
Trilbyspaceclone
bacd0d39de recomplie 2019-10-01 20:56:01 -04: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
Thalpy
bfee1c13ff Bhijin's requests. 2019-10-01 20:58:31 +01:00
Seris02
07f7e6105a SPOOKTOBER
because serb told me to
2019-10-01 22:14:05 +08:00
Seris02
89277e6206 Merge pull request #2 from Citadel-Station-13/master
updating fork from browser
2019-10-01 22:11:14 +08:00
Fermi
4b6d996416 Merge branch 'master' into Blind-quirk-without-anger 2019-10-01 08:41:12 +01:00
Thalpy
cf8db59649 Merge branch 'master' into FERMICHEMCurTweaks 2019-10-01 08:20:16 +01: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
13276d3d96 Tests 2019-10-01 07:35:59 +01: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
Poojawa
117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
TrilbySpaceClone
3f893195bf tested! 2019-09-30 11:42:07 -04:00
Weblure
da1209cc8b Adds Xenobio Console hotkeys
Includes some minor tweaks to existing coding
2019-09-29 18:23:19 -07:00