shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,166 Commits 5 Branches 0 Tags
e5aa6ea1cd223c08935cdcdab4e2d8a4e5127ffa
Commit Graph

152 Commits

Author SHA1 Message Date
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
Poojawa
ce281774e1 I mean, I guess? (#5521) 2018-02-16 13:28:37 -06:00
Poojawa
11e8725033 cryo pods on all main maps + roundstart_templet fixes 2018-02-14 17:45:13 -06:00
Poojawa
7be88d5fea Metastation's cryopods 2018-02-14 16:30:17 -06:00
deathride58
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 Dupont
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 Brown
38fdf92660 Merge pull request #35610 from ShizCalev/fridge-cleanup 
Cleans up turf underneath fridges
 2018-02-13 21:00:14 -06: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
Jordan Brown
5fca9331f6 Merge pull request #35509 from DaxDupont/too-much-assblast 
Removes duplicate air alarm on meta.
 2018-02-11 11:36:36 -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
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 Dupont
1cc06510ec Fixes crematorium on meta/box. (#35305) 2018-02-05 11:01:57 -06:00
CitadelStationBot
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
CitadelStationBot
98d18ee7e3 [MIRROR] Removes tripai landmark (#5280) 
* Removes tripai landmark

* Update landmarks.dm
 2018-02-05 04:44:31 -06:00
CitadelStationBot
5385333a64 Fixes some broken accesses (#5287) 2018-02-05 02:25:16 -06:00
CitadelStationBot
ec127471e8 Makes departemental lathes easier to access. (#5274) 2018-02-05 02:09:16 -06:00
CitadelStationBot
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
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
Jittai
f8bf40e7cc Morgue and Crematorium Repositions 2018-01-31 02:21:45 -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
Jordan Brown
b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant 
Makes revenants spawn on dead bodies & bodycontainers
 2018-01-28 18:03:41 -06:00
Leo
90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup 
Cleans up unused mob vars
 2018-01-23 06:44:32 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
oranges
8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly 
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 04:23:03 -06:00
oranges
8b4788a884 Merge pull request #34101 from ShizCalev/got-a-light- 
Removes omnizine (traitor) cigarettes from captain's office on Meta
 2018-01-11 14:05:06 -06:00
deathride58
fcad1432a9 readds citadel specific map changes 2018-01-07 17:04:51 -05:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
ShizCalev
53d7dfbb9b Fixes meta toxins lab (#34087) 2018-01-05 06:01:27 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
vuonojenmustaturska
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
CitadelStationBot
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
deathride58
276a2c1015 Merge pull request #4241 from Citadel-Station-13/upstream-merge-33267 
[MIRROR] [Metastation] Moves drone dispenser to Robotics maint
 2017-12-10 23:55:35 +00:00
deathride58
cdc23ad79e Merge pull request #4240 from Citadel-Station-13/upstream-merge-33265 
[MIRROR]  Good Clean Fun: A vending machine for games!
 2017-12-10 23:50:05 +00:00
deathride58
3a8c2b3be0 fixes map conflicts 2017-12-10 18:17:25 -05:00
uraniummeltdown
d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
coiax
3b665e6af1 [Metastation] Moves drone dispenser to Robotics maint 2017-12-05 17:45:59 -06:00
coiax
1cc3e865bf Good Clean Fun: A vending machine for games! 2017-12-05 17:20:21 -06:00
coiax
e7fd239238 [Metastation] Easel in Quiet Room moved to art storage (#33240) 
That easel awkwardly blocks access to the table in the corner, so I've
moved it to art storage, removing a photocopier from art storage to
allow it to fit.
 2017-12-05 03:22:56 -06:00
deathride58
f6a2966fca fixes merge conflicts 2017-12-04 18:24:04 -05:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
ACCount
f089b9ca2d Removes mass-spectrometers 2017-11-28 06:27:55 -06:00
ACCount
2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58
0ca050563f fixes merge conflicts 2017-11-22 23:43:03 -05:00
ShizCalev
1b094a4374 Fixes deleted turfs 2017-11-22 22:01:05 -06:00
ShizCalev
8a83b50113 Stacked turf cleanup (#32933) 2017-11-21 22:28:48 -06:00
deathride58
5a331eedad Merge pull request #4055 from Citadel-Station-13/upstream-merge-32931 
[MIRROR] Fixes dynamic lighting / nearstation area issues.
 2017-11-21 21:23:46 +00:00