Commit Graph

1752 Commits

Author SHA1 Message Date
Lin a084733397 Merge pull request #15179 from Citadel-Station-13/why
adds policy configs for elite fauna and prisoner role
2021-09-20 23:58:21 -05:00
silicons f48bf3cdc0 Merge pull request #15174 from buffyuwu/holoparasites
probably fixes holoparasites
2021-09-19 11:10:45 -07:00
silicons 1bc24575d4 Merge pull request #15084 from keronshb/plaguefix
Fixes Plague Rats + other buffs
2021-09-19 11:03:05 -07:00
silicons 849dbc7fb3 sigh 2021-09-18 19:37:24 -07:00
buffyuwu 96643c7aba probably fixes holoparasites
closes #15151 if it works
2021-09-18 01:22:24 -04:00
silicons fb05100008 Update mouse.dm (#15115) 2021-09-15 00:16:57 +02:00
keronshb bb74dd4adf Cap fix 2021-09-10 12:01:46 -04:00
keronshb a2a8d74fd8 Vent and spawning 2021-09-09 20:12:47 -04:00
silicons 5de5be462f Update colossus.dm 2021-09-08 02:36:40 -07:00
keronshb 2808e855b5 Explosive Pop fix 2021-09-06 10:30:41 -04:00
keronshb 5102cacdb4 Prevents them from spawning off station z 2021-09-06 09:50:21 -04:00
keronshb 468a610f15 Corpsefix 2021-09-06 09:31:45 -04:00
keronshb a8d1b377e4 Plaguefix 2021-09-05 21:22:53 -04:00
keronshb 8904950cf5 Gremlinfix 2021-09-05 14:35:38 -04:00
silicons 3cae7df6c8 Merge pull request #15002 from keronshb/plaguerats
Plague Rats
2021-08-26 21:41:07 -07:00
silicons 13130b3ee6 Merge pull request #15015 from keronshb/gremlinport
Gremlin Port
2021-08-26 21:40:59 -07:00
DeltaFire e87bd464ff sigh 2021-08-26 04:21:52 +02:00
DeltaFire c713dbdef1 carprift armor 2021-08-26 04:20:23 +02:00
DeltaFire 38aa220e6a no nullijng allowed 2021-08-26 04:02:22 +02:00
DeltaFire f8866774aa no scattering 2021-08-26 03:30:51 +02:00
keronshb 0b8221c9ac Change to 20 minutes 2021-08-19 22:49:19 -04:00
keronshb 1b43c5b1ae Merge remote-tracking branch 'upstream/master' into gremlinport 2021-08-17 09:03:09 -04:00
keronshb 45aed7a218 Gremlins 2021-08-15 23:48:24 -04:00
keronshb 5395a78410 Fixes linter 2021-08-12 13:24:31 -04:00
keronshb bf17f3c4ea Plague Rats
Here they come.
2021-08-12 12:56:33 -04:00
silicons 51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
2021-08-11 02:54:49 -07:00
silicons 59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
Artur 5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Putnam3145 9a62fed735 /proc/ 2021-07-25 19:55:48 -07:00
Putnam3145 95d2adb996 a bunch of async and waitfor 2021-07-25 19:51:27 -07:00
Putnam3145 cd2a710a23 there's too many errors caused by these two 2021-07-25 19:36:23 -07:00
Artur 67de120624 Replaces a few more direct blood refillers 2021-07-23 18:58:42 +03:00
SandPoot 3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
Putnam3145 970e089fb0 glass houses 2021-07-03 03:52:07 -07:00
Putnam3145 15078f0f71 Properly optimizes watchers 2021-07-03 03:50:43 -07:00
Putnam3145 e11cc190e7 Watcher optimization 2021-07-03 03:40:34 -07:00
Putnam3145 f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
silicons a29d107d33 Merge pull request #14899 from shellspeed1/blood-drunk-miner-drop
Moves tendril KA upgrade disks to blood drunk miner.
2021-06-29 08:51:10 -07:00
shellspeed1 26cb16311d A 2021-06-27 20:08:33 -07:00
Putnam3145 630098c8aa that might be all 2021-06-21 20:03:27 -07:00
Putnam3145 0bf383a90b does this fix it 2021-06-21 09:18:06 -07:00
Putnam3145 f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
silicons 3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon
(READY) Ports Space Dragon Midround Event.
2021-06-18 20:03:43 -07:00
Putnam3145 dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
Putnam 833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
Timothy Teakettle baad78e7fe bee 2021-06-11 16:08:55 +01:00
silicons 09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon
New Challenger: The Cat Surgeon has appeared! (Ready!)
2021-06-09 11:29:24 -07:00
silicons eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00