Commit Graph
15390 Commits
Author SHA1 Message Date
Putnam caf9bc56da Make replacement update icon 2019-10-07 01:34:22 -07:00
Putnam b452de12ff Made PanD.E.M.I.C beaker stuff more like ChemMaster 2019-10-07 01:23:17 -07:00
kevinz000andGitHub 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
Ghommie 8228e52f43 Ports "Makes the illegal tech node harder to unlock" 2019-10-07 06:19:48 +02:00
Ghommie 7dfd6005d9 I hate nerfing things :( 2019-10-06 19:24:31 +02:00
Ghommie a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Ghommie a9e30720ec key, ckey, key, ckey 2019-10-06 18:40:24 +02:00
Fermi ea031d6d40 Slowly getting there 2019-10-06 11:09:54 +01:00
Ghommie f01f00710f Porting some spraycan fixes. 2019-10-06 05:30:16 +02:00
Fermi d023d58b2c Changes 2019-10-06 02:10:46 +01:00
Fermi 63647b58ba Merge branch 'Spookytime' of https://github.com/Thalpy/Citadel-Station-13 into Spookytime 2019-10-06 00:37:01 +01:00
Fermi aff7f808ec oops 2019-10-06 00:36:57 +01:00
Thalpy 3f21c0af5b Text 2019-10-06 00:32:42 +01:00
ThalpyandGitHub 27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
Ghommie 32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
kevinz000andGitHub 4fd31bce32 Merge pull request #9382 from jakeramsay007/Cyborg-chair-unbuckling
Borgs are now capable of unbuckling people from chairs, beds and themselves
2019-10-05 08:27:00 -07:00
kevinz000andGitHub 356755d710 Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
2019-10-05 08:26:40 -07:00
kevinz000andGitHub 22f9c9f711 Merge pull request #9401 from Poojawa/patch-2
APC UI autoupdates properly
2019-10-05 08:23:22 -07:00
kevinz000andGitHub a923ea984a Merge pull request #9388 from Sishen1542/dynamicadminfix
Dynamic now auto-deadmin friendly
2019-10-05 08:22:47 -07:00
kevinz000andGitHub b691da0bca Merge pull request #9407 from Poojawa/cryo-qol
Adds Cryo QoL with hotkeys
2019-10-05 08:22:01 -07:00
Ghommie e31c441b3d rogue tabbing 2019-10-05 07:52:52 +02:00
Ghommie 367789fda4 yes 2019-10-05 07:16:17 +02:00
Ghommie 3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Ghommie 52fb4b03ac we are only keeping track of the number of singu beacons, var more efficient. 2019-10-05 05:29:57 +02:00
Ghommie 35a6991300 lone rogue parenthesis 2019-10-05 05:14:38 +02:00
Ghommie d706944e20 The niche singularity beacon now also moderately buffs meteor waves. 2019-10-05 04:37:01 +02:00
Ghommie 34bef911b2 macro arguments 2019-10-05 03:49:06 +02:00
Ghommie b6cc81d097 flooring. 2019-10-05 03:13:51 +02:00
Ghommie e4705ae5c0 Actually... let's do some scaling. 2019-10-05 02:57:50 +02:00
Ghommie 2b8fe43ef1 Removes the minimum player cap for the war ops. 2019-10-05 02:31:02 +02:00
Poojawa 9f88a72142 Makes Medsprays align with patches
Also ensures you can't spray it on ghosts, ai eyes, etc.
2019-10-04 16:06:07 -05:00
Poojawa 9d2d84f53d Update table_frames.dm 2019-10-04 15:49:25 -05:00
Ghommie 1c2f2617d8 Ports "Makes supermatter melt walls if it finds itself in one" 2019-10-04 22:44:40 +02:00
Poojawa 35d33b4f3b mob_occupant 2019-10-04 10:05:08 -05:00
Poojawa cda97faaa5 UI and proper deletion stuff 2019-10-04 09:52:42 -05:00
Poojawa 209b195822 this probably doesn't fix the shitty console, but 2019-10-04 07:31:31 -05:00
Poojawa 0716b48a99 unmodularize it 2019-10-04 06:56:57 -05: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
FermiandFermi 7f74a98372 .9 2019-10-04 04:55:36 +01:00
FermiandFermi 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
FermiandFermi 79e85e2cfa Fixes some runtimes 2019-10-04 03:53:02 +01:00
FermiandFermi 10f5fc3b47 Buffer fix 2019-10-04 03:22:53 +01:00
deathride58andGitHub 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
deathride58andGitHub 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
PoojawaandGitHub a8e16ce27e APC UI autoupdates properly 2019-10-03 14:00:17 -05:00
ArturlangandGitHub 47037c1d57 Instakill-man-bad
OwO
2019-10-03 10:54:56 +03:00