Commit Graph

2008 Commits

Author SHA1 Message Date
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
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08: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
TripleShades
bf8c87f373 Update MetaStation.dmm
fixes surgery apc being rotated incorrectly, moves wheelchair out of storage for public access
2021-01-01 15:49:57 -08:00
TripleShades
c57a5520fa Update MetaStation.dmm 2021-01-01 14:59:01 -08:00
MrJWhit
d0aaf0abfc touchups for sec box 2020-12-30 21:00:46 -05:00
EmeraldSundisk
ab260dcdec Add files via upload 2020-12-29 12:30:09 -08:00
EmeraldSundisk
6c5c342bb8 Update CogStation.dmm 2020-12-29 12:20:25 -08:00
silicons
a7ed197675 Merge pull request #13884 from Hatterhat/are-you-fucking-kidding-me
":n hey miners don't forget the dock silver" the PR - also includes a box whiteship tinyfan fix
2020-12-29 01:28:39 -07:00
silicons
da25c48b2c Merge pull request #13855 from Chiirno/paramedBoxOffice
Paramed office on box + Surgery remodel
2020-12-29 01:27:49 -07:00
Letter N
d82def21b8 linter shoo 2020-12-29 12:32:10 +08:00
Letter N
f28363ae56 code quality 2020-12-29 11:12:56 +08:00
Chiirno
1df5aefcd9 re-added replacement lights to Starboard Emergency Storage 2020-12-28 05:49:17 -04:00
Chiirno
782e6037c5 added a holopad to kitchen and hydroponics. 2020-12-28 02:28:36 -04:00
Hatterhat
a8f1960c5b disregard the branch name 2020-12-27 01:14:12 -06:00
Chiirno
81fe7f4230 returned access to Starboard Emergency Storage 2020-12-27 03:01:29 -04:00
Chiirno
6beb47ef6d re-removed bedsheet on morgue tray 2020-12-27 02:46:00 -04:00
Blue Wildrose
6d89c9f7b6 I learned about mapmerger 2020-12-26 16:39:20 -07:00
Chiirno
6508f76fcf removed toxins mixing chamber zone and replaced it with toxins mixing lab zone 2020-12-26 18:56:14 -04:00
Chiirno
269182f6ec added al light switch to surgery 2020-12-26 18:53:55 -04:00
Blue Wildrose
cac5e6dad6 A Pubby Christmas 2020-12-25 20:59:10 -07:00
Chiirno
cb4780739a added one more paramed spawn in office, for a total of three 2020-12-23 22:44:33 -04:00
Chiirno
4d85410327 bleached surgical storage, shrunk office and expanded emergency storage. Minor rearrangements of wallmounts wires and misc objects. 2020-12-23 21:14:46 -04:00
Chiirno
3dc96ce0d2 moved consoles around so they are adjacent to the surgery tables 2020-12-23 03:54:58 -04:00
Chiirno
08b40e3483 added quotation marks to an airlocks name 2020-12-23 02:11:42 -04:00
Chiirno
bbbe99e99d switched the air cannister and the heater in Starboard Emergency Storage 2020-12-23 01:59:07 -04:00
Chiirno
739574731f removed the second air alarm in surgery 2020-12-23 01:46:12 -04:00
Chiirno
a267e61cbd solidified paramed morgue airlock, moved surgery fridge, and rearranged some of the wall mountings. 2020-12-23 00:56:28 -04:00
Chiirno
35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00
silicons
ea21151462 LF 2020-12-20 18:55:45 -07:00
MrJWhit
9f7d87759d Update BoxStation.dmm 2020-12-15 13:55:30 -05:00