e18244671f
Merge pull request #10350 from Putnam3145/dojo-ghostrole
...
Ghost cafe quality-of-life, plus making ghost role eligibility an element
2020-01-05 23:05:13 +01:00
db13f748aa
Merge pull request #10317 from Trilbyspaceclone/map_redo
...
Corrects issues with box map
2020-01-05 16:24:46 +01:00
6f20ab520c
Merge pull request #10378 from EmeraldSundisk/metacloset
...
A simple fix and a simple test.
2020-01-04 22:43:22 +01:00
adf87c7595
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
2020-01-02 22:52:24 -08:00
304ac7b20b
fixes
2020-01-02 21:06:31 -05:00
f7b91f9b65
Merge pull request #10238 from Ghommie/Ghommie-cit478
...
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
8255cb82aa
C'mon now...
2019-12-31 18:06:05 -08:00
4b6e8cfa18
no, not a cryo...
2019-12-30 01:26:03 -08:00
8d00e4f094
added crematorium, replaced every floor in the ghost cafe with indestructible ones
2019-12-30 01:17:48 -08:00
9adb7a718d
random airlock b-gone
2019-12-30 03:10:13 -05:00
a4c356ad57
added a cryo to the ghost cafe
2019-12-29 21:28:09 -08:00
51742d5da5
tada
2019-12-29 20:08:30 -05:00
c8dcdcbcf2
Update BoxStation.dmm
2019-12-29 18:09:45 -05:00
42f0648f78
Merge branch 'master' into map_redo
2019-12-29 16:52:47 -05:00
0edbbc5a04
remves cable
2019-12-29 00:33:39 -05:00
7d23e543e2
readds cell 4
2019-12-28 00:24:20 -05:00
1d40732e3f
weh
2019-12-27 23:41:34 -05:00
f8c039f9eb
Update CentCom.dmm
2019-12-27 21:39:01 -05:00
93248336ea
Merge pull request #10265 from Trilbyspaceclone/map_redo
...
Cit-iftyed Box map as well as adding back blasters back to armory
2019-12-27 22:54:35 +01:00
13fc20c7c3
Merge pull request #10296 from Useroth/ghostcafe
...
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
2019-12-27 16:30:13 +01:00
35846c452a
Applied suggestions and minor tweaks.
2019-12-26 20:03:43 +01:00
cbff758d1a
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
2019-12-26 07:49:48 +01:00
1c34ab661d
Update BoxStation.dmm
2019-12-25 02:07:33 -05:00
ec0596c404
Update
2019-12-23 18:52:33 -05:00
9a022f21eb
Merge pull request #10245 from r4d6/substationV2
...
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
2019-12-23 18:58:26 +01:00
85ceda474e
Merge pull request #10218 from GrayRachnid/ADDS-MINERS
...
Adds gas miners to all maps.
2019-12-23 00:45:22 -08:00
b7ee64dd5d
Steos are bad
2019-12-22 02:45:07 -05:00
c7dbdd73df
Merge branch 'master' into donut
2019-12-22 02:36:57 -05:00
d3a8025675
Wew
2019-12-22 02:17:24 -05:00
5a189b2354
QoL Update
...
- Rename the cameras and place two more
- Unanchor the shields generators and emitters because they were bugged and will save more time
- Put more rad closets on the Singulo
- Put more insuls on the Tesla since they protect
- Moved the Engineer clothing locker to Boxstation instead of having it in the Engine
- Added a button to the shutters on the north side of PA
- Added a marker to show where to place the console
- Rewire the power wire to be more in a straight line.
2019-12-21 23:09:43 -05:00
445a7fb855
Redo my changes on Box
...
Hopefully this will fix the conflict with the fire alarms.
2019-12-19 23:57:49 -05:00
4d466e17f3
Merge pull request #10173 from Ghommie/Ghommie-cit461
...
Fixing a boxstation pipenet mapping issue.
2019-12-19 23:43:16 +00:00
f38747ed70
Merge pull request #10207 from Ghommie/Ghommie-cit468
...
Fixes pubby wall meds being var-edited snowflakes.
2019-12-19 23:41:36 +00:00
8566e2396d
Brings in some mapping code updates.
2019-12-19 00:44:14 +01:00
3cb8391f38
Hopefully this won't screw up travis.
2019-12-17 12:15:28 +01:00
774d853607
Adds gas miners to all maps.
2019-12-17 01:39:25 -05:00
f738e370a4
Fixes pubby wall meds being var-edited snowflakes.
2019-12-16 15:22:50 +01:00
0b879f0f73
Fixing a boxstation pipenet mapping issue.
2019-12-13 16:57:48 +01:00
4502d7b795
Ports improved and simplier fire alarms.
2019-12-12 22:44:20 +01:00
562bf2d492
fix
2019-12-07 04:04:07 -05:00
b05854ac98
Merge pull request #9947 from Iroquois-Pliskin/ClockieSurgeryNerf
...
Removes Clockie Surgical capabilities
2019-12-05 22:02:38 -07:00
fbcdc4d330
Merge pull request #9575 from KathrinBailey/Kat'sBoxRework
...
Box Beautification & Bar Rework & Issue 9706 Fix
2019-12-05 21:38:30 -07:00
ae729d400b
Permabrig broken area fix
...
oopsie I forgot because I'm always tired fuck 6am morning shifts.
2019-11-30 03:25:21 +00:00
d73b93d4a7
Addresses Aelita + Gray + Sylvara, fixes cams, detective office & HoP stamp, room names and airlock cyclelink
...
Fixes:
• Missing HoP stamp
• Missing Detective handcuffs
• Improper dorms camera names
• Luxury rooms not really mentioned to be luxury
• Missing airlock cyclelink helper on maint south area that was reworked for better EVA spacewalking on the outside.
2019-11-30 01:30:12 +00:00
90009904cf
Maaapmeeergeeee?
...
I forgot last commit. Hopefully this'll do it.
2019-11-28 19:35:08 +00:00
9a9c63bea3
Removes Clockie Surgical capabilities, including table, tools, and implanter/implant case.
2019-11-26 09:28:40 -05:00
c1e3b07b2c
Bugfixes
...
Fixes incorrect areas
Fixes disconnected air canisters in maint
Adds Persi's sleepers back into perma
Small changes to perma to make it look slightly cleaner. Kink room in perma because it's probably really boring in there.
2019-11-25 16:11:06 +00:00
9ee4acd143
Persi's Sleepers
2019-11-23 16:00:30 +00:00
532fab092f
Bugfix from testmerge
...
Fixes the terrible stupid mistake.
Blood bank generator in medical lathe room on request, it's there on Pubby and heck I suppose it's something for doctors to do.
2019-11-23 06:41:23 +00:00
18e1246fd0
Classic fixes
2019-11-21 03:16:18 +00:00
Ghom