shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,070 Commits 5 Branches 0 Tags
cfe5c7a96256ae00a0704b670d2f11cc84159c19
Commit Graph

752 Commits

Author SHA1 Message Date
oranges
e0c31c2b3a Merge pull request #37984 from AutomaticFrenzy/patch/thunderdome 
Fix entertainment monitors viewing the wrong Thunderdome
 2018-05-23 05:15:46 -05:00
LetterJay
86f69e2947 Merge pull request #6796 from Citadel-Station-13/upstream-merge-37890 
[MIRROR] [Ready] Adds "proper" solar/gold/silver crates
 2018-05-19 09:13:58 -05:00
81Denton
5ed28b5cd2 Adds "proper" solar/gold/silver crates (#37890) 
* adds solar/gold/silver crates

* replaces pubbystation crates

* hhhh

* forgot adding spaces

* travis pls
 2018-05-19 02:14:00 -05:00
Mark9013100
21b9f72e49 Deltastation edits/fixes (#37876) 
Readds a missing solar panel to port-bow solars.
Replaces an access locked kitchen fridge in arrivals maintenance with its no-access variant.
Readds missing decal warning lines.
 2018-05-17 21:16:02 -05:00
deathride58
cee67a7706 Merge pull request #6760 from Citadel-Station-13/upstream-merge-37602 
[MIRROR] [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping
 2018-05-17 18:11:24 +00:00
iksyp
8dab7deb9a The crashed abductor ship is now fully deconstructable (#37834) 
* walls

*abductor lavaland ruin walls are now destructible

* just fucking uglify it

it saves me the hassle of having to subtype
 2018-05-17 10:32:55 -05:00
81Denton
0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
deathride58
bb1fe6cba2 Merge pull request #6660 from GrayRachnid/add-dorms-to-ninja-capture 
Add dorms to ninja capture
 2018-05-15 20:53:05 +00:00
LetterJay
ce98f9c444 Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785 
[MIRROR] Replaces loose tech storage boards with spawners
 2018-05-15 06:53:25 -05:00
LetterJay
f86af0ab41 Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818 
[MIRROR] Fix some missing icons
 2018-05-15 06:52:32 -05:00
Jordan Brown
3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
Jordan Brown
7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons 
Fix some missing icons
 2018-05-14 15:13:33 -05:00
Jordan Brown
5a76b56d04 Merge pull request #37743 from AutomaticFrenzy/patch/meta-pipe 
Remove a duplicate pipe in MetaStation maint
 2018-05-14 11:01:08 -05:00
81Denton
8463204549 Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers 2018-05-12 18:53:59 -05:00
GrayRachnid
a7196f0d4c Unlocks the booze locker 2018-05-07 12:29:36 -04:00
GrayRachnid
e22259a77d mapmerger 2018-05-06 16:37:44 -04:00
GrayRachnid
41ce1b1e5b Now ready for all your ERP needs. 2018-05-06 16:20:49 -04:00
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
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