shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,917 Commits 5 Branches 0 Tags
089c2e70b2e80ae9903a532af2bef8fc2d71b400
Commit Graph
697 Commits
Author SHA1 Message Date
Zna12 e457b1ddc5 Meta Station ORM Security 
Added a windoor to Meta Station's ORM
 2018-01-28 21:05:50 -06:00
Zna12 906412690d Delta Station ORM Movement 
Delta Station ORM Moved to more publicly accessable area.
 2018-01-28 21:03:32 -06:00
Zna12 27204a32c8 Box Station ORM and Protolathe Movements 
Moved the ORM and Protolathe in cargo around to help lower the ammount of break ins that happen.
 2018-01-28 20:56:06 -06:00
Zna12 51b8d8706a Revert "ORM Security." 
This reverts commit f6af76ab4e.
 2018-01-28 20:18:41 -06:00
Zna12 f6af76ab4e ORM Security. 
Ore Redemption Machines have been moved to more publicly accessable areas on Box and Delta stations. All stations now have a Mineral Storage locked windoor in front of the ORM. Also moved the Cargo Protolathe into the mining dock because Miners kept breaking into the cargo bay to grab shit on high pop rounds.
 2018-01-28 18:54:52 -06:00
Jordan BrownandCitadelStationBot b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant 
Makes revenants spawn on dead bodies & bodycontainers
 2018-01-28 18:03:41 -06:00
LeoandCitadelStationBot d4fb182401 Merge pull request #35073 from ShizCalev/box-fixes 
Fixes bad APC name on Boxstation
 2018-01-28 16:22:56 -06:00
FrozenGuy5andCitadelStationBot a77e139fd8 Changes up the Construction Area on Box slightly. 2018-01-28 14:33:41 -06:00
JalleoandCitadelStationBot 0ceb915b60 Same with the SPACE_IS_SMALLER but only with smaller maps (#34984) 2018-01-27 23:20:25 -06:00
JalleoandCitadelStationBot 6d5250f18b Shrinks template maps (#34935) 
* OH GOD HOW DID THE MAPS GET SMALLER?

* How did that happen?

* Removes one more row
 2018-01-26 08:46:40 -06:00
LetterJayandGitHub 13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466 
[MIRROR] Fake nuclear disks are even more convincing
 2018-01-25 13:41:02 -06:00
LetterJay 069972b3a0 map 2018-01-25 12:59:30 -06:00
LetterJay 41adb46c2a fixes travis 2018-01-24 21:51:02 -06:00
LetterJayandGitHub 1dffa54809 Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623 
[MIRROR] Makes templates able to use PlaceOnTop
 2018-01-24 21:44:21 -06:00
LetterJayandGitHub c30127d0d5 Merge pull request #5089 from Citadel-Station-13/upstream-merge-34841 
[MIRROR] Fixes derelict area issues
 2018-01-24 21:43:24 -06:00
Jordan BrownandCitadelStationBot 829cf4d180 Merge pull request #34623 from ninjanomnom/template-placeontop 
Makes templates able to use PlaceOnTop
 2018-01-24 18:18:31 -06:00
Jordan BrownandCitadelStationBot 5d4531010d Merge pull request #34841 from ShizCalev/derelict-fix 
Fixes derelict area issues
 2018-01-24 18:09:54 -06:00
MMMiraclesandCitadelStationBot 521e309da4 baseturf editors on syndicate base (#34815) 2018-01-24 15:43:33 -06:00
LetterJayandGitHub 937d6c473a Merge pull request #5048 from Citadel-Station-13/upstream-merge-34769 
[MIRROR] Cleans up unused mob vars
 2018-01-24 13:56:23 -06:00
Jordan BrownandCitadelStationBot d7975510e4 Fixes omega missing a wheat fridge and runtiming pipenets 2018-01-24 06:12:20 -06:00
LeoandCitadelStationBot 90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup 
Cleans up unused mob vars
 2018-01-23 06:44:32 -06:00
coiaxandCitadelStationBot f425c5496f Fake nuclear disks are even more convincing 2018-01-23 01:41:21 -06:00
LetterJayandGitHub c5ec80819f Merge pull request #4943 from Citadel-Station-13/upstream-merge-34571 
[MIRROR] Low memory mode
 2018-01-21 11:47:27 -06:00
LetterJayandGitHub 8fe7ac2b6f Merge pull request #4927 from Citadel-Station-13/upstream-merge-34581 
[MIRROR] Corrects some stacked turf
 2018-01-21 11:46:51 -06:00
deathride58andGitHub 15d1adfea8 Update _basemap.dm 2018-01-19 14:38:12 -05:00
Jordan BrownandCitadelStationBot f706605227 Low memory mode 2018-01-19 09:12:37 -06:00
Jordan BrownandCitadelStationBot 95b6959190 Merge pull request #34576 from coiax/removes-teleport-beacon-from-golem-ship 
Removes teleport beacon from Free Golem Ship
 2018-01-19 08:50:20 -06:00
LeoandCitadelStationBot b59c8c6e71 Merge pull request #34581 from ShizCalev/stacked-turf-cleanup 
Corrects some stacked turf
 2018-01-19 08:16:31 -06:00
ShizCalevandCitadelStationBot f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
deathride58 9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
deathride58andGitHub d7e2967bc8 Merge pull request #4891 from Citadel-Station-13/upstream-merge-34502 
[MIRROR] Update Space Station 13 decal on RuntimeStation
 2018-01-17 20:13:17 +00:00
Jordan BrownandCitadelStationBot ed95343715 Merge pull request #34502 from AutomaticFrenzy/patch/runtime-decal 
Update Space Station 13 decal on RuntimeStation
 2018-01-16 14:47:02 -06:00
orangesandCitadelStationBot c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps 
Fails travis on common mapping mistakes
 2018-01-16 14:37:26 -06:00
Jordan BrownandCitadelStationBot ca154abed1 Merge pull request #34471 from Thunder12345/shuttlefix2 
No more air leaks from the asteroid shuttle
 2018-01-16 07:32:25 -06:00
deathride58andGitHub 30af76a0a2 Merge pull request #4845 from Citadel-Station-13/upstream-merge-34325 
[MIRROR]  Makes the lavaland mining base have more correct baseturfs
 2018-01-15 15:40:45 +00:00
Emmett GainesandCitadelStationBot a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
WJohnandCitadelStationBot 16596405e1 Remakes the space syndicate listening post. (#34309) 
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
 2018-01-15 07:18:15 -06:00
Dax DupontandCitadelStationBot 077ec06f78 Rebases and redoes it with the fix with mapmerge2 2018-01-13 14:52:21 -06:00
deathride58andGitHub a572a24dfe Merge pull request #4809 from Citadel-Station-13/upstream-merge-34355 
[MIRROR] Fixes goon escape shuttle
 2018-01-13 20:28:22 +00:00
LeoandCitadelStationBot 710f69aac9 Merge pull request #34355 from Thunder12345/shuttlefix 
Fixes goon escape shuttle
 2018-01-13 08:59:55 -06:00
orangesandCitadelStationBot 8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly 
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 04:23:03 -06:00
Dax DupontandCitadelStationBot af73323477 Adds an indestructible disco/dance machine for admemes and disco inferno shuttle (#34260) 
* Dance machine fix

* I have no ass and i must blast
 2018-01-11 21:36:56 -06:00
orangesandCitadelStationBot 8b4788a884 Merge pull request #34101 from ShizCalev/got-a-light- 
Removes omnizine (traitor) cigarettes from captain's office on Meta
 2018-01-11 14:05:06 -06:00
deathride58 9a33ac7177 TGUI recompile, fixes map conflicts 2018-01-11 00:05:34 -05:00
orangesandCitadelStationBot 1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58 7280d91628 Minor boxstation changes, merges #4694 and #4697 2018-01-08 00:55:05 -05:00
deathride58 fcad1432a9 readds citadel specific map changes 2018-01-07 17:04:51 -05:00
deathride58andGitHub d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
ShizCalevandCitadelStationBot 53d7dfbb9b Fixes meta toxins lab (#34087) 2018-01-05 06:01:27 -06:00
deathride58 9834c3a499 merges #4665 2018-01-04 22:52:05 -05:00