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

177 Commits

Author SHA1 Message Date
Jordan Brown
deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -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
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -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
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
ShizCalev
5dfd1f7d42 grunge airlock 2018-04-13 09:04:55 -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
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
Tad Hardesty
47850573b0 Fix N2 filter in deep storage ruin (#36523) 2018-03-20 07:53:55 -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
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
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
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
CitadelStationBot
766b85908e [MIRROR] Adds the Ancient Cloning Lab ruin (#5814) 
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
 2018-03-05 15:20:49 -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
758d740112 [MIRROR] Cycle links space ruin airlocks (#5660) 
* Cycle links space ruin airlocks (#35870)

* cycle links space ruin airlocks

* loooooooooooooong ship

* Cycle links space ruin airlocks
 2018-02-22 23:39:49 -06:00
CitadelStationBot
133bf4e224 [MIRROR] Cycle links pt.2: the linkening (#5659) 
* Cycle links pt.2: the linkening (#35871)

* cyclelink 2: the linkening

* removes whiteship_box cycle link

* Cycle links pt.2: the linkening
 2018-02-22 23:39:25 -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
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
ExcessiveUseOfCobblestone
745ca227c3 Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities (#35427) 
* Update portable_turret.dm

* Update portable_turret.dm

* Update portable_turret.dm

* f
 2018-02-13 20:47: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
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
MMMiracles
2d499b938c adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168) 
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
 2018-02-07 20:23:32 -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
fa38b8a2f3 [MIRROR] Readds the syndicate comms officer (#5290) 
* Readds the syndicate comms officer

* Update listeningstation.dmm
 2018-02-05 03:19:54 -06:00
CitadelStationBot
5385333a64 Fixes some broken accesses (#5287) 2018-02-05 02:25:16 -06:00
CitadelStationBot
c2f14117c4 [MIRROR] Lava map slights (#5273) 
* Lava map slights (#35201)

* Updates a few maps a tad on lavaland

* Adds two freezers to syndicate lavaland for some chefing

* Lava map slights
 2018-02-05 02:09:45 -06:00
CitadelStationBot
ba06d1cb97 [MIRROR] Listening fix (#5231) 
* Removes ghost spawner from Syndicate listening ruin (#35083)

* Does what Kor says

* Other part of the fix if Kor wants it

* Does what KorPhearon wants

* Listening fix
 2018-02-04 22:09:38 -06:00
CitadelStationBot
450fda474a [MIRROR] Corrects space tiles on Abandoned Teleporter (#5224) 
* Corrects space tiles on Abandoned Teleporter

* Corrects space tiles on Abandoned Teleporter
 2018-02-04 22:06:04 -06:00
Poojawa
faccc43461 fucking github REEEEEEEEEEE 2018-01-31 18:33:46 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
LetterJay
a45e8527db Merge pull request #5121 from Citadel-Station-13/upstream-merge-34935 
[MIRROR] OH GOD HOW DID THE MAPS GET SMALLER?
 2018-01-31 03:02:10 -06:00
Poojawa
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
Jalleo
0ceb915b60 Same with the SPACE_IS_SMALLER but only with smaller maps (#34984) 2018-01-27 23:20:25 -06:00
Jalleo
6d5250f18b Shrinks template maps (#34935) 
* OH GOD HOW DID THE MAPS GET SMALLER?

* How did that happen?

* Removes one more row
 2018-01-26 08:46:40 -06:00
LetterJay
1dffa54809 Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623 
[MIRROR] Makes templates able to use PlaceOnTop
 2018-01-24 21:44:21 -06:00
Jordan Brown
829cf4d180 Merge pull request #34623 from ninjanomnom/template-placeontop 
Makes templates able to use PlaceOnTop
 2018-01-24 18:18:31 -06:00
Jordan Brown
5d4531010d Merge pull request #34841 from ShizCalev/derelict-fix 
Fixes derelict area issues
 2018-01-24 18:09:54 -06:00
LetterJay
8fe7ac2b6f Merge pull request #4927 from Citadel-Station-13/upstream-merge-34581 
[MIRROR] Corrects some stacked turf
 2018-01-21 11:46:51 -06:00
Jordan Brown
95b6959190 Merge pull request #34576 from coiax/removes-teleport-beacon-from-golem-ship 
Removes teleport beacon from Free Golem Ship
 2018-01-19 08:50:20 -06:00