Commit Graph

17813 Commits

Author SHA1 Message Date
Ghommie 8228e52f43 Ports "Makes the illegal tech node harder to unlock" 2019-10-07 06:19:48 +02:00
Ghommie 5232728ee7 Ports "Adds three new .38 ammo types", also lazily adding .357 AP 2019-10-07 05:25:47 +02:00
Ghommie 31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-10-06 21:54:15 +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
Poojawa ee5155bdbb fixes oddities 2019-10-06 04:27:46 -05:00
Poojawa 0b00ffb4d0 Boosts NPC runtime priority
Doesnt' effect idle NPCs, but once they wake up. WEW
2019-10-06 00:00:27 -05:00
Ghommie f01f00710f Porting some spraycan fixes. 2019-10-06 05:30:16 +02:00
Linzolle e009a4cc3d Revert "pooj fixed this anyway"
This reverts commit 6ce8db8d7b.
2019-10-05 22:15:48 -05: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
Thalpy 27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Thalpy 5f5c719326 Merge branch 'master' into FERMICHEMCurTweaks 2019-10-05 23:40:26 +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
Linzolle caa61fa0b4 hide your ass 2019-10-05 12:24:10 -05: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
Trilbyspaceclone 0b2c743f72 readds 2019-10-05 11:53:14 -04:00
Trilbyspaceclone f43bd91072 Merge branch 'master' into A_Tailer's_art 2019-10-05 11:50:12 -04:00
Linzolle 4fc9385e44 oops 2019-10-05 10:40:31 -05:00
Linzolle 6ce8db8d7b pooj fixed this anyway 2019-10-05 10:38:17 -05:00
kevinz000 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
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 a923ea984a Merge pull request #9388 from Sishen1542/dynamicadminfix
Dynamic now auto-deadmin friendly
2019-10-05 08:22:47 -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
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
kevinz000 b0a6624d73 Update Hallucination.dm 2019-10-04 22:12:35 -07: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 4edfbd1dfa clarifying grammar 2019-10-04 17:23:41 -05:00
Poojawa 0c574fb62a Update medicine_reagents.dm 2019-10-04 16:53:32 -05:00
Poojawa 26c7a0ddb7 Promotes more chemical variety 2019-10-04 16:45:25 -05: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