shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,969 Commits 5 Branches 0 Tags
2bd4aa98ed79cc95bebd63bec9f38dff4cec08ea
Commit Graph

508 Commits

Author SHA1 Message Date
ShizCalev
b569465705 Adds lights to the bridge on Omega (#36537) 2018-03-21 01:04:05 -05:00
CitadelStationBot
1d6d8b454c [MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017) 
* Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE

* FUCK (#36483)

F A L S E
semicolon be gone
 2018-03-19 21:12:46 -05:00
Tad Hardesty
5edfbf5224 Fix mislabelled and stacked OmegaStation cameras (#36460) 
* Fix stacked camera in OmegaStation departures

* Move some Omega cameras to the correct network
 2018-03-17 07:52:52 -05:00
Poojawa
74eddfd888 Fixes broken engineering in Pubby 2018-03-15 20:45:50 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
deathride58
7b9dac0a47 Makes the titlescreen properly positioned for widescreen again (#5874) 
* Makes the titlescreen properly positioned for widescreen again

* Appeases Pooj, requests knot
 2018-03-13 18:38:49 -05:00
CitadelStationBot
41612ee1f6 [MIRROR] Fixes Delta atmos maint access (#5897) 
* Fixes Delta atmos maint access (#36291)

* Fixes Delta atmos maint access
 2018-03-10 23:08:41 -06:00
CitadelStationBot
21bd33233b [MIRROR] Delta: Adds wall safes to HoP/Cap offices (#5895) 
* Delta: Adds wall safes to HoP/Cap offices (#36281)

* fixes atmos emergency exit area, adds wall safes

* reverts atmos maint area

* Delta: Adds wall safes to HoP/Cap offices
 2018-03-10 23:08:15 -06:00
CitadelStationBot
b03917057b [MIRROR] Removes the smoke machine from roundstart chemistry (#5881) 
* Unmaps the smoke machine (#36260)

* Removes the smoke machine from roundstart chemistry
 2018-03-10 07:35:09 -06:00
CitadelStationBot
a999863e5c [MIRROR] Fixes mirror var desync (#5883) 
* Fixes mirror var desync (#36251)

* Fixes mirror var desync
 2018-03-10 07:17:52 -06:00
deathride58
a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055 
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
 2018-03-09 19:25:12 +00:00
deathride58
31d7baf516 Update runtimestation.dmm 2018-03-09 13:43:12 -05:00
deathride58
aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070 
[MIRROR] Beacons are no longer radios
 2018-03-09 18:41:05 +00:00
kevinz000
91ac70a73e RND TECHWEBS: TECHFABS (#36055) 
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
 2018-03-07 21:11:56 -06:00
Dax Dupont
72e3ffa562 Beacons are no longer radios (#36070) 
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
 2018-03-07 14:43:25 -06:00
Poojawa
bbdf396d28 Pissy babies have their consoles back. 
Not like they play science anyway.
 2018-03-07 00:12:43 -06:00
Poojawa
86b11050b6 Citadel's folder's end (#5828) 
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
 2018-03-06 17:40:48 -06:00
CitadelStationBot
9a2ea0eb69 [MIRROR] Pubbystation: tweaks and fixes round two (#5803) 
* Pubbystation: tweaks and fixes round two

* pubby fixes
 2018-03-06 07:08:16 -06:00
Poojawa
0afe9eb7c3 All Maps now have Tesla as a primary engine (#5787) 
* Converts all stations except Omega to Tesla Engines

* tweaks and meta fixes

* removes an exploit

* add some missing lights
 2018-03-06 03:59:11 -06:00
CitadelStationBot
fe37e351bc [MIRROR] Updates RuntimeStation to make testing faster (#5807) 
* Merge pull request #36120 from XDTM/RuntimeFuntime

Updates RuntimeStation to make testing faster

* Updates RuntimeStation to make testing faster
 2018-03-05 13:00:50 -06:00
81Denton
4a15c347e7 Makes Delta chem fridge more accessible (#36125) 
* 20 hours in dream maker

* REMOVE WINDOOR FROM THE PREMISES
 2018-03-04 17:25:12 -06:00
CitadelStationBot
674179361a [MIRROR] Pubbystation: Firelocks, shutters, fixes (#5764) 
* Pubbystation: Firelocks, shutters, fixes

* Pubby fixes, again.
 2018-03-03 21:46:52 -06:00
Jordie
b27fde9e2e Merge pull request #36061 from ShizCalev/pubby-rad-collector-anchor 
Fixes anchored radiation collectors in Pubby ESS
 2018-03-03 00:04:25 -06:00
CitadelStationBot
16dc017835 [MIRROR] Pubby fixes (#5683) 
* Pubby fixes

* fixes pubby mabye

* actually fixes Pubby. Also fixes missing wire near cryo
 2018-03-02 20:08:55 -06:00
CitadelStationBot
227b09860e [MIRROR] Makes the assault pod docking port non-timid (#5742) 
* Makes the assault pod docking port non-timid (#36045)

* Makes the assault pod docking port non-timid
 2018-03-02 18:32:12 -06:00
CitadelStationBot
56137e19d7 [MIRROR] Fixes missing wire on boxstation (#5737) 
* Merge pull request #36011

Fixes missing wire on boxstation

* Fixes missing wire on boxstation
 2018-02-28 19:30:28 -06:00
ShizCalev
e1f9bdf2b2 Cleans up double stacked firedoor on Pubby 2018-02-25 16:48:01 -06:00
deathride58
21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733 
[MIRROR] [s] Cameranet fixes
 2018-02-23 13:21:23 +00:00
CitadelStationBot
af34232b1a [MIRROR] Adds techweb doppler arrays and fixes their name/desc (#5653) 
* adds techweb doppler arrays, fixes techweb desc/name (#35846)

* Adds techweb doppler arrays and fixes their name/desc
 2018-02-22 01:29:26 -06:00
ShizCalev
d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
Poojawa
7d488e8f4c Citadel'd Maps from #5523 (#5551) 
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
 2018-02-17 18:04:28 -06:00
deathride58
d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339 
[MIRROR] Support stations with multiple z-levels
 2018-02-17 21:24:48 +00:00
Poojawa
ce281774e1 I mean, I guess? (#5521) 2018-02-16 13:28:37 -06:00
Tad Hardesty
5b30b29a4b Support stations with multiple z-levels (#35339) 
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
 2018-02-15 10:39:08 -06:00
Poojawa
b43669e2e8 fixes bad piping. 2018-02-14 19:05:27 -06:00
Poojawa
b4005577f2 reee. step_y 2018-02-14 18:02:10 -06:00
Poojawa
11e8725033 cryo pods on all main maps + roundstart_templet fixes 2018-02-14 17:45:13 -06:00
Poojawa
7be88d5fea Metastation's cryopods 2018-02-14 16:30:17 -06:00
Poojawa
a7b1b5cbdf Adds cryo area and boxstation goodies 2018-02-14 16:26:38 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
deathride58
5bf11ca6d5 Merge pull request #5477 from Citadel-Station-13/upstream-merge-35506 
[MIRROR] Assblasts some power creep in circuit labs
 2018-02-14 04:10:32 +00:00
Dax Dupont
98c9e0948f Assblasts some power creep in circuit labs (#35506) 
* Circuit printers no longer start upgraded.

* Replaces roundstart upgraded printer with regular printer

* Replaces roundstart upgraded printer with regular printer w\ key remap
 2018-02-13 21:09:35 -06:00
Jordan Brown
38fdf92660 Merge pull request #35610 from ShizCalev/fridge-cleanup 
Cleans up turf underneath fridges
 2018-02-13 21:00:14 -06:00
deathride58
e3ad2643b2 maps first 2018-02-12 20:30:05 -05:00
Jordan Brown
ebd82bfe50 Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2 
Actually fixes broken accesses
 2018-02-11 15:48:40 -06:00
Jordan Brown
5fca9331f6 Merge pull request #35509 from DaxDupont/too-much-assblast 
Removes duplicate air alarm on meta.
 2018-02-11 11:36:36 -06:00
CitadelStationBot
717da969a6 [MIRROR] Var cleanup and map fixes (#5359) 
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
 2018-02-07 20:04:04 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327) 
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
 2018-02-06 19:06:31 -06:00
CitadelStationBot
b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333) 
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
 2018-02-06 18:24:51 -06:00
Dax Dupont
1cc06510ec Fixes crematorium on meta/box. (#35305) 2018-02-05 11:01:57 -06:00