shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,764 Commits 5 Branches 0 Tags
dff9dabf068fae39f2fcbe2c2d6809fb8811d3bf
Commit Graph
150 Commits
Author SHA1 Message Date
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa a999863e5c [MIRROR] Fixes mirror var desync (#5883) 
* Fixes mirror var desync (#36251)

* Fixes mirror var desync
 2018-03-10 07:17:52 -06:00
deathride58andGitHub 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
deathride58andGitHub 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
kevinz000andCitadelStationBot 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 DupontandCitadelStationBot 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
PoojawaandGitHub 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
PoojawaandGitHub 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
CitadelStationBotandPoojawa 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
deathride58andGitHub 21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733 
[MIRROR] [s] Cameranet fixes
 2018-02-23 13:21:23 +00:00
CitadelStationBotandPoojawa 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
ShizCalevandCitadelStationBot d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
PoojawaandGitHub 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
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 a7b1b5cbdf Adds cryo area and boxstation goodies 2018-02-14 16:26:38 -06:00
deathride58andGitHub 4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
deathride58andGitHub 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 DupontandCitadelStationBot 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 BrownandCitadelStationBot 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 BrownandCitadelStationBot ebd82bfe50 Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2 
Actually fixes broken accesses
 2018-02-11 15:48:40 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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 DupontandCitadelStationBot 1cc06510ec Fixes crematorium on meta/box. (#35305) 2018-02-05 11:01:57 -06:00
CitadelStationBotandPoojawa 92212cdcb6 [MIRROR] Moves the spare ID inside the captain's locker (#5291) 
* Moves the spare ID inside the captain's locker (#35219)

* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)

* Moves the spare ID inside the captain's locker
 2018-02-05 05:36:09 -06:00
CitadelStationBotandPoojawa 98d18ee7e3 [MIRROR] Removes tripai landmark (#5280) 
* Removes tripai landmark

* Update landmarks.dm
 2018-02-05 04:44:31 -06:00
CitadelStationBotandPoojawa 5385333a64 Fixes some broken accesses (#5287) 2018-02-05 02:25:16 -06:00
CitadelStationBotandPoojawa ec127471e8 Makes departemental lathes easier to access. (#5274) 2018-02-05 02:09:16 -06:00
CitadelStationBotandPoojawa 5aec2724c1 [MIRROR] The firelock on Box's circuit lab no longer covers up the room's airlock (#5270) 
* Moves the circ. lab firelock down a tile (#35217)

* The firelock on Box's circuit lab no longer covers up the room's airlock
 2018-02-04 23:02:01 -06:00
CitadelStationBotandPoojawa 799038ab26 [MIRROR] blasts away a double stacked blast door in atmosia (#5240) 
* blasts away a double stacked blast door in atmosia

* blasts away a double stacked blast door in atmosia
 2018-02-04 22:20:26 -06:00
Poojawa 56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
PoojawaandGitHub 03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -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
FrozenGuy5andCitadelStationBot a77e139fd8 Changes up the Construction Area on Box slightly. 2018-01-28 14:33:41 -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
deathride58 9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05: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
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
vuonojenmustaturskaandCitadelStationBot 9dd9d9413a Improves loot drop spawners, adds AI law spawners to cores (#33945) 
* hymn to breaking strain

* remove subtypes as requested

* no-one saw that
 2017-12-31 02:27:12 -06:00
deathride58 e7f3cd9e24 Map syncs - departmental lathes and more 2017-12-13 14:37:48 -05:00
Jordan BrownandCitadelStationBot f021ed2716 Merge pull request #33450 from ShizCalev/sec-lockers 
Adds security departmental lockers to Box & Pubby
 2017-12-12 13:06:59 -06:00
CitadelStationBotandkevinz000 cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58andGitHub 7e68709634 Merge pull request #4272 from Citadel-Station-13/upstream-merge-33342 
[MIRROR] [Box] Moves drone dispenser to Robotics maintenance
 2017-12-11 00:41:04 +00:00