Commit Graph

17813 Commits

Author SHA1 Message Date
kevinz000 266d7adfa6 Update adminhelp.dm 2019-10-03 22:11:46 -07:00
Poojawa e52652f8c8 Differing carpet reactions 2019-10-03 23:19:52 -05: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
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
Poojawa 27b26978be Quartermaster is a head of staff
Suck it, non believers.
2019-10-03 19:13:56 -05: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
Arturlang 47037c1d57 Instakill-man-bad
OwO
2019-10-03 10:54:56 +03:00
Ghommie 7c77f2d2e3 testing... 2019-10-03 08:57:35 +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 08ed166c08 Merge pull request #9365 from Ghommie/Ghommie-cit211
Fixing an issue with DNA scanners maintenance hatches with sleeper code updates.
2019-10-02 00:06:13 -07:00
kevinz000 1aac0942e9 Merge pull request #9373 from Trilbyspaceclone/beepalm
Beebalm and Honeybalm plants
2019-10-02 00:02:05 -07:00
kevinz000 af9336edde Merge pull request #9366 from Raptorizer/MelonSeedBuff
Equalized the power of the melon seed.
2019-10-02 00:01: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 fbaa8d355f Update dynamic.dm 2019-10-02 02:39:58 -04: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
Sishen 0abcbe0fb5 Update suit_storage_unit.dm 2019-10-01 23:49:46 -04: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
Sishen c9fb4cecbc Update neovgre.dm 2019-10-01 22:30:20 -04:00
Sishen ad7ea00627 Update neovgre.dm 2019-10-01 22:29:03 -04:00
Chayse Ramsay bf6575c67d Borgs are now capable of unbuckling people from chairs, beds, and themselves. 2019-10-02 02:38:39 +01:00
Trilbyspaceclone bacd0d39de recomplie 2019-10-01 20:56:01 -04:00
Ghommie d245a9d28d addendum 2019-10-02 00:42:19 +02:00
Ghommie 2a84162c59 incorrect number of macro arguments 2019-10-02 00:38:58 +02:00
Ghommie 81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00
Ghommie e635a05d16 errors. 2019-10-01 23:43:38 +02:00
Ghommie d2300765b2 adjacency checks. 2019-10-01 23:16:47 +02:00