shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,581 Commits 5 Branches 0 Tags
ea3d6a1977411b84d287c8d565372fdba1b4891c
Commit Graph

796 Commits

Author SHA1 Message Date
r4d6
98bb9397ea fix cyborgs spawns 2020-01-16 21:05:51 -05:00
kevinz000
c69d882943 Merge pull request #10521 from BlackMajor/master 
Fixes roundstart borg spawns, plus a little bit extra.
 2020-01-12 00:40:48 -08:00
Putnam
312da86424 Suggested changes 2020-01-11 01:28:49 -08:00
BlackMajor
30fc5b560b Couple of lingering fixes 2020-01-11 17:57:18 +13:00
BlackMajor
b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
Putnam
9750eb3d42 "quotation marks" 2020-01-06 23:52:07 -08:00
Putnam
b5026256db aaand a few more 2020-01-06 23:42:27 -08:00
Putnam
6f6f0cbb62 Tweaks to ghost dojo 2020-01-06 23:33:29 -08:00
Ghom
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
Ghom
db13f748aa Merge pull request #10317 from Trilbyspaceclone/map_redo 
Corrects issues with box map
 2020-01-05 16:24:46 +01:00
Ghom
6f20ab520c Merge pull request #10378 from EmeraldSundisk/metacloset 
A simple fix and a simple test.
 2020-01-04 22:43:22 +01:00
Putnam
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
TrilbySpaceClone
304ac7b20b fixes 2020-01-02 21:06:31 -05:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2020-01-03 00:01:54 +00:00
EmeraldSundisk
8255cb82aa C'mon now... 2019-12-31 18:06:05 -08:00
Putnam
4b6e8cfa18 no, not a cryo... 2019-12-30 01:26:03 -08:00
Putnam
8d00e4f094 added crematorium, replaced every floor in the ghost cafe with indestructible ones 2019-12-30 01:17:48 -08:00
TrilbySpaceClone
9adb7a718d random airlock b-gone 2019-12-30 03:10:13 -05:00
Putnam
a4c356ad57 added a cryo to the ghost cafe 2019-12-29 21:28:09 -08:00
TrilbySpaceClone
51742d5da5 tada 2019-12-29 20:08:30 -05:00
TrilbySpaceClone
c8dcdcbcf2 Update BoxStation.dmm 2019-12-29 18:09:45 -05:00
TrilbySpaceClone
42f0648f78 Merge branch 'master' into map_redo 2019-12-29 16:52:47 -05:00
TrilbySpaceClone
0edbbc5a04 remves cable 2019-12-29 00:33:39 -05:00
TrilbySpaceClone
7d23e543e2 readds cell 4 2019-12-28 00:24:20 -05:00
TrilbySpaceClone
1d40732e3f weh 2019-12-27 23:41:34 -05:00
Trilbyspaceclone
f8c039f9eb Update CentCom.dmm 2019-12-27 21:39:01 -05:00
Ghom
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
Ghom
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
Useroth
35846c452a Applied suggestions and minor tweaks. 2019-12-26 20:03:43 +01:00
Useroth
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
TrilbySpaceClone
1c34ab661d Update BoxStation.dmm 2019-12-25 02:07:33 -05:00
TrilbySpaceClone
ec0596c404 Update 2019-12-23 18:52:33 -05:00
Ghom
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
kevinz000
85ceda474e Merge pull request #10218 from GrayRachnid/ADDS-MINERS 
Adds gas miners to all maps.
 2019-12-23 00:45:22 -08:00
TrilbySpaceClone
b7ee64dd5d Steos are bad 2019-12-22 02:45:07 -05:00
TrilbySpaceClone
c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
TrilbySpaceClone
d3a8025675 Wew 2019-12-22 02:17:24 -05:00
r4d6
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
r4d6
445a7fb855 Redo my changes on Box 
Hopefully this will fix the conflict with the fire alarms.
 2019-12-19 23:57:49 -05:00
Lin
4d466e17f3 Merge pull request #10173 from Ghommie/Ghommie-cit461 
Fixing a boxstation pipenet mapping issue.
 2019-12-19 23:43:16 +00:00
Lin
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
Ghommie
8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Ghommie
3cb8391f38 Hopefully this won't screw up travis. 2019-12-17 12:15:28 +01:00
GrayRachnid
774d853607 Adds gas miners to all maps. 2019-12-17 01:39:25 -05:00
Ghommie
f738e370a4 Fixes pubby wall meds being var-edited snowflakes. 2019-12-16 15:22:50 +01:00
Ghommie
0b879f0f73 Fixing a boxstation pipenet mapping issue. 2019-12-13 16:57:48 +01:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
TrilbySpaceClone
562bf2d492 fix 2019-12-07 04:04:07 -05:00
kevinz000
b05854ac98 Merge pull request #9947 from Iroquois-Pliskin/ClockieSurgeryNerf 
Removes Clockie Surgical capabilities
 2019-12-05 22:02:38 -07:00
kevinz000
fbcdc4d330 Merge pull request #9575 from KathrinBailey/Kat'sBoxRework 
Box Beautification & Bar Rework & Issue 9706 Fix
 2019-12-05 21:38:30 -07:00