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

732 Commits

Author SHA1 Message Date
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
LetterJay
8cdbc9ef5e Merge pull request #6452 from Citadel-Station-13/upstream-merge-37268 
[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-22 02:44:56 -05:00
LetterJay
bc0afc3c09 Merge pull request #6426 from Citadel-Station-13/upstream-merge-37206 
[MIRROR] Correct some pixel_z issues
 2018-04-22 02:37:42 -05:00
Jordan Brown
44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix 
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-18 11:34:06 -05:00
81Denton
7caad40e3f Fixes lavaland syndie base rads + SSU compartment issues (#37252) 
* radsuit SSU, syndie lava base rad protection

* re-adds missing combat gloves

* defines radsuit SSU name by the obj
 2018-04-18 07:02:10 -05:00
Jordan Brown
de896c2929 Merge pull request #37206 from AutomaticFrenzy/patch/pixel-z 
Correct some pixel_z issues
 2018-04-15 22:23:58 -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
51c718aa31 Merge pull request #6362 from Citadel-Station-13/upstream-merge-37106 
[MIRROR] Fixes duplicate docking port on aux base template
 2018-04-14 07:44:08 -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
ShizCalev
9879300633 Fixes duplicate docking port on aux base template 2018-04-11 07:32:09 -05:00
81Denton
50e139871c FUCKING COMPILE (#37051) 2018-04-10 17:02:35 -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
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815 
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
 2018-04-05 00:17:27 +00:00
LetterJay
f7be23e78a Merge branch 'master' into upstream-merge-36442 2018-04-01 19:50:37 -05:00
LetterJay
77a4b58c60 Merge pull request #6132 from Michiyamenotehifunana/gimme-da-blasta 
Adds Particle Blasters to armories
 2018-04-01 19:49:27 -05:00
KorPhaeron
01ff7cf8da Refactors Dance Machine + deletes a bunch of sound files 2018-04-01 09:42:14 -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
Michiyamenotehifunana
8e620324a8 maps particle blasters 2018-03-27 23:05:16 +08: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
CitadelStationBot
bb1aaf01e7 [MIRROR] Plastic flaps are now airtight (#6098) 
* Plastic flaps are now airtight (#36659)

* flaps

* fucking flaps, how do they work?

* Plastic flaps are now airtight
 2018-03-26 04:20:12 -05:00
CitadelStationBot
441b8f4314 [MIRROR] Syndie lavaland base: adds turret control panel, soap, chemistry supplies (#6073) 
* Syndie lavaland base: adds turret control panel, soap, chemistry supplies (#36486)

* turret control test
area change, tests v2
test v3 finished
ailock
linebreak
soap
science goggles

* control_area fix, chemistry supplies

* how the hell

* Syndie lavaland base: adds turret control panel, soap, chemistry supplies
 2018-03-22 06:13:07 -05:00
ShizCalev
b569465705 Adds lights to the bridge on Omega (#36537) 2018-03-21 01:04:05 -05:00
Tad Hardesty
47850573b0 Fix N2 filter in deep storage ruin (#36523) 2018-03-20 07:53:55 -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
CitadelStationBot
1fd5de5bfe [MIRROR] Fixes stacks and material containers, fixes wet floors (#6008) 
* Fixes stacks and material containers, fixes wet floors (#36497)

* Fixes stacks and material containers, fixes wet floors
 2018-03-19 21:06:33 -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