shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

280 Commits

Author SHA1 Message Date
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
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
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 5aec2724c1 [MIRROR] The firelock on Box's circuit lab no longer covers up the room's airlock (#5270) 
* Moves the circ. lab firelock down a tile (#35217)

* The firelock on Box's circuit lab no longer covers up the room's airlock
 2018-02-04 23:02:01 -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 56232d5d60 Maps and misc 2018-01-31 06:20:26 -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
FrozenGuy5 a77e139fd8 Changes up the Construction Area on Box slightly. 2018-01-28 14:33:41 -06:00
Leo b59c8c6e71 Merge pull request #34581 from ShizCalev/stacked-turf-cleanup 
Corrects some stacked turf
 2018-01-19 08:16:31 -06:00
deathride58 9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
deathride58 9a33ac7177 TGUI recompile, fixes map conflicts 2018-01-11 00:05:34 -05:00
oranges 1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58 7280d91628 Minor boxstation changes, merges #4694 and #4697 2018-01-08 00:55:05 -05:00
deathride58 fcad1432a9 readds citadel specific map changes 2018-01-07 17:04:51 -05: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
Jordan Brown f021ed2716 Merge pull request #33450 from ShizCalev/sec-lockers 
Adds security departmental lockers to Box & Pubby
 2017-12-12 13:06:59 -06: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 7e68709634 Merge pull request #4272 from Citadel-Station-13/upstream-merge-33342 
[MIRROR] [Box] Moves drone dispenser to Robotics maintenance
 2017-12-11 00:41:04 +00:00
deathride58 add4b774e5 fixes map conflicts 2017-12-10 19:00:08 -05: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 9d50222ef6 fixes merge conflicts 2017-12-10 17:54:20 -05:00
uraniummeltdown d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
coiax 04dc992f97 [Box] Moves drone dispenser to Robotics maintenance 2017-12-08 10:35:39 -06:00
coiax 1cc3e865bf Good Clean Fun: A vending machine for games! 2017-12-05 17:20:21 -06:00
deathride58 f6a2966fca fixes merge conflicts 2017-12-04 18:24:04 -05:00
deathride58 379f73d1e1 Merge branch 'master' into upstream-merge-32249 2017-12-04 23:15:38 +00: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
Leo f016daa833 Merge pull request #33179 from nicbn/removesmices 
Removes the mob mouse from maintenance from maps
 2017-12-02 09:44:39 -06:00
ACCount f089b9ca2d Removes mass-spectrometers 2017-11-28 06:27:55 -06:00
deathride58 470f4169df Merge pull request #4095 from Citadel-Station-13/upstream-merge-33018 
[MIRROR] Replaces "console screen" stock part with glass sheets
 2017-11-24 06:42:51 +00:00
ACCount 2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58 c81ebbfc24 fixes boxstation issues, readds removed boxstation areas 2017-11-22 22:18:40 -05:00
ShizCalev 8a83b50113 Stacked turf cleanup (#32933) 2017-11-21 22:28:48 -06:00
deathride58 5d5d4451a9 fixes merge conflicts 2017-11-21 14:35:43 -05:00
ShizCalev 2c65f5c6b5 Fixes dynamic lighting / nearstation area issues. 2017-11-21 08:41:54 -06:00
deathride58 e72399de7c pain 2017-11-21 00:29:15 -05:00
deathride58 0d11dfc6ef COMPILE, FOUL CREATURE 2017-11-20 23:39:23 -05:00
deathride58 d52e405912 hOPEFULLY FIXES THE GOD DAMN MERGE CONFLICTS 2017-11-20 23:12:58 -05:00