Commit Graph

1407 Commits

Author SHA1 Message Date
DeltaFire 79a464ca8c Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00
silicons 2a6ccada97 Merge pull request #14402 from Hatterhat/limbgrowers
limb growers for pubby and delta
2021-03-12 19:35:56 -07:00
Hatterhat 946096fd1d qm console announce 2021-03-10 22:35:33 -06:00
Hatterhat 2d157c51fa ok liberal 2021-03-10 09:09:50 -06:00
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Dan-Neposh 2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
DeltaFire 6bcee44179 Merge pull request #14221 from MrJWhit/delta-station-fix
Random delta station fix
2021-02-11 04:33:30 +01:00
MrJWhit dba9fd7134 Update DeltaStation2.dmm 2021-02-10 00:04:44 -05:00
MrJWhit 94b507dbf3 Update BoxStation.dmm 2021-02-09 16:31:58 -05:00
MrJWhit c7f6c037f5 Boxstation disposals update 2021-02-06 16:31:30 -05:00
MrJWhit ce675498f4 Gee kevin, why does atmos get /two/ air alarms? 2021-01-28 14:22:01 -05:00
silicons 34cb148232 Merge pull request #14067 from TripleShades/box-chapel
Box Chapel Redecoration [updated]
2021-01-27 19:11:20 -07:00
TripleShades b13c2de218 fuck 2021-01-25 11:48:13 -08:00
TripleShades 3ae6d63290 i can always change it back right 2021-01-25 11:24:40 -08:00
MrJWhit 661a5e6580 WHOOPS DIDN'T MEAN TO DELETE THAT 2021-01-23 03:53:36 -05:00
MrJWhit d8f76a023b Tada 2021-01-23 03:44:55 -05:00
Dan-Neposh c38e5ca446 puts the eminence spire back in Reebe until the eminence vote changes 2021-01-21 23:46:21 -05:00
silicons 30755bfeb9 Merge pull request #14078 from MrJWhit/metastation-toxins-fix-2-electric-bogaloo
Gives metastation toxins storage a scrubber 'n vent
2021-01-20 15:21:55 -07:00
Letter N 125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
TripleShades eb20501cc0 oops missed this light switch from earlier box surgery pr 2021-01-18 11:50:41 -08:00
MrJWhit 0c45aab261 Update MetaStation.dmm 2021-01-17 04:45:55 -05:00
MrJWhit 5f5c7667df Update MetaStation.dmm 2021-01-17 03:48:41 -05:00
TripleShades 1c9c0b7745 Update BoxStation.dmm 2021-01-15 17:42:36 -08:00
TripleShades 36e82c59d6 Update BoxStation.dmm 2021-01-15 17:30:10 -08:00
TripleShades 1f1605bbb6 Update BoxStation.dmm 2021-01-15 16:54:24 -08:00
MrJWhit 68f8258f82 Teehee oops 2021-01-15 09:52:39 -05:00
MrJWhit 02abd90e1f Update PubbyStation.dmm 2021-01-15 09:45:32 -05:00
Dan-Neposh 04d5721c4d Merge branch 'master' into clockcultrework_v2 2021-01-14 19:51:15 -05:00
Blue Wildrose 5436db5f3b Add a color mate to the ghost cafe as well, yeah 2021-01-12 13:55:42 -07:00
Blue Wildrose 32aa851062 somethings up with the HoS pet carp on Kilo, fixing that 2021-01-12 06:54:06 -07:00
Blue Wildrose 8111757e5b oops messed something up with kilo 2021-01-12 06:49:31 -07:00
Blue Wildrose 2ab6a5cf96 Adds Colormates to every map except Snaxi 2021-01-12 06:26:13 -07:00
MrJWhit cb7d81a8e1 Update MetaStation.dmm 2021-01-08 02:41:45 -05:00
MrJWhit 8108109965 Fixes a mistake on metastation 2021-01-06 18:04:40 -05:00
MrJWhit abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
silicons e4e029a061 Merge pull request #13961 from MrJWhit/snipping-the-ai-thread
Fuck it, I'll just fix a whole bunch of stuff on cogstation
2021-01-05 23:40:07 -07:00
silicons e6aac9d4fb Merge pull request #13970 from TripleShades/fixies-oops
Meta Surgery Fixies
2021-01-05 23:39:53 -07:00
TripleShades 3bb244410c oops leftover decal 2021-01-05 22:13:57 -08:00
MrJWhit 98520dc519 Update CogStation.dmm 2021-01-05 19:38:30 -05:00
MrJWhit ab856c75bb Update CogStation.dmm 2021-01-05 19:25:44 -05:00
MrJWhit f88957986f Update BoxStation.dmm 2021-01-05 16:21:37 -05:00
MrJWhit 1a49d9738a Update CogStation.dmm 2021-01-05 00:54:34 -05:00
MrJWhit 3fd72b9ec2 Update BoxStation.dmm 2021-01-04 20:33:36 -05:00
TripleShades 518da2ea06 Update MetaStation.dmm 2021-01-04 15:39:08 -08:00
MrJWhit 27b5c3957f Snip snip 2021-01-04 01:26:14 -05:00
silicons a0d58cd18d Merge pull request #13954 from EmeraldSundisk/coglocks
Cog and firelocks.
2021-01-03 20:19:46 -07:00
EmeraldSundisk 3e813c1ecc Add files via upload 2021-01-03 00:16:02 -08:00
TripleShades 79db7e0db5 Changed out lightswitch for extinguisher on Recovery Room outer wall; Replaced wall with Clean Hands poster with a drape; Added Nanomeds to surgery 2021-01-02 16:00:49 -08:00
Letter N 64f9605b51 map conflict any% 2021-01-02 19:56:04 +08:00
EmeraldSundisk 5961d09298 Update CogStation.dmm 2021-01-01 23:08:21 -08:00