shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,489 Commits 5 Branches 0 Tags
b11e600cff1cf8d2e73f2f110a787dba4df8756a
Commit Graph

530 Commits

Author SHA1 Message Date
LetterJay
f387bb1694 Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622 
[MIRROR] Changes cockroach guts to insect guts
 2018-05-05 09:40:11 -05:00
Jordan Brown
5fae4a6c90 Merge pull request #37649 from 81Denton/watch-me-mash-my-keyboard-fwgiupghebipuernbvepw9vb85344355v 
Fixes runtimestation RnD machinery, adds circ printer+analyzer
 2018-05-04 11:17:40 -05:00
Jordan Brown
deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -05:00
pigeons
2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
Jordan Brown
8dd48870c1 Merge pull request #37570 from BuffEngineering/WestSolars 
Fixes mapping issue on deltastation
 2018-04-30 21:20:34 -05:00
YakumoChen
8bb3a4ec75 Readds BZ Cannisters for Xenobiology (#37481) 
* update BoxStation.dmm

Adds BZ to Xeno

* Update DeltaStation2.dmm

adds BZ to Xeno

* Update MetaStation.dmm

Updates Meta's Xeno with BZ

* Update PubbyStation.dmm

Adds BZ to Pubby's Xeno
 2018-04-30 01:12:22 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
Armhulen
17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
Poojawa
45b1869666 fixes some rushed mapping issues. 2018-04-23 20:47:11 -05:00
Poojawa
b1d64e221a core maps updated. Lavaland mining base now has cryo 2018-04-23 04:30:03 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
81Denton
3bcfd0dfb6 Delta ORM position (#37325) 
* makes delta ORM accessible

* turf decal
 2018-04-22 19:21:04 -05:00
Jordan Brown
492a31d37c Merge pull request #37195 from 81Denton/remove-tinyfan-from-the-premises 
Removes tinyfans from omega/delta tcomms
 2018-04-15 09:57:25 -05:00
LetterJay
5d5dc5483e Merge pull request #6399 from Citadel-Station-13/upstream-merge-37158 
[MIRROR] Cleans up CENTCOM morgue/chapel/library doors
 2018-04-14 07:42:57 -05:00
ShizCalev
5dfd1f7d42 grunge airlock 2018-04-13 09:04:55 -05:00
Emmett Gaines
d139c8ebb3 Updates baseturf helpers to the new baseturf system (#37154) 2018-04-13 07:58:37 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
LetterJay
f7be23e78a Merge branch 'master' into upstream-merge-36442 2018-04-01 19:50:37 -05:00
vuonojenmustaturska
b58c0a8157 Merge pull request #36850 from 81Denton/pubby-bombsite-cams 
Pubby: fixes bomb testing site cam networks
 2018-04-01 07:26:31 -05:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
CitadelStationBot
bcc360d0d9 [MIRROR] Fixes omega detective office + prepare_maps change (#6110) 
* Fixes omega detective office + prepare_maps change (#36691)

* Fixes Omega Detectives office

* Mentions mapmerge isntead of run map merge

* Fixes omega detective office + prepare_maps change
 2018-03-26 04:31:41 -05:00
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