shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
2532 Commits
Author SHA1 Message Date
MrJWhitandGitHub 2ce118f851 MetaStation atmos update (#12099) 
* Finishes up meta station atmos

* Update MetaStation.dmm
 2020-05-04 05:05:27 +02:00
Detective Google f812cddf93 unfucks this and makes it use the icebox framework 2020-05-03 20:04:20 -05:00
Detective Google e197513bcc fixes lone ops and ninjas 2020-05-03 01:22:18 -05:00
Detective Google bad9e76e50 Fixes pirates, ops, the mining base, and gives pirates and ops drills 2020-05-03 00:28:28 -05:00
MrJWhitandGitHub a5c3e3ff2b Oh god please let this be the final boxstation update (#12089) 2020-05-03 03:53:44 +02:00
Detective Google 7b03bbbcb2 whoopps 2020-05-02 18:34:31 -05:00
Detective Google 5bef1281a4 Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml 2020-05-02 17:45:02 -05:00
Detective Google 25d84a6317 brings the engioutpost ruin over as well 2020-05-02 17:44:23 -05:00
Detective-GoogleandGitHub 6db5655ceb Merge branch 'master' into 91-files-changed-fml 2020-05-02 17:16:18 -05:00
Detective Google 13aa536027 makes the wendigo fight have the same atmos as the surrounding icemoon 2020-05-01 20:13:53 -05:00
kevinz000andGitHub ea831677a1 Merge pull request #11961 from Ghommie/Ghommie-cit697 
toylathe copypasta removal and preparations for economy public lathe nerf.
 2020-05-01 14:52:29 -07:00
Ghommie 54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
MrJWhitandGitHub 6b4747d5fe Meta station atmos opening up (#12047) 
* Spawning area fix.

Part one of many

* Finishing up atmos

* Haha final fixes

* Security camera update

* Haha whoops, thanks lilly
 2020-05-01 21:26:36 +02:00
MrJWhitandGitHub 5bdafb78c1 Minor updates to pubby for fixing (#12059) 
* updates to pubby

* Dear justin, double check something BEFORE publishing it
 2020-05-01 18:56:40 +02:00
Detective Google 836cf17a5b fixes the SM up 2020-05-01 11:40:43 -05:00
MrJWhitandGitHub 61f6631486 Update engine_sm.dmm (#12062) 2020-05-01 18:26:50 +02:00
Detective Google 8af556e014 backwards couch backwards couch 2020-05-01 11:03:15 -05:00
Detective Google daff847d93 fixes wendigo cave having no air 2020-05-01 01:58:31 -05:00
Detective Google 7ef5246b19 fixes a bunch of mismatch atmos in ruins 2020-05-01 01:33:14 -05:00
Detective Google 2832b86e11 some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life 2020-05-01 01:17:56 -05:00
kevinz000 8677e3b112 dmm2tgm 2020-04-30 19:14:44 -07:00
Detective Google 9c049ef02b more mapping fixes 2020-04-30 21:02:31 -05:00
Detective Google e0fe368560 Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml 2020-04-30 20:25:54 -05:00
Detective Google d0024575e7 fixes the non matching turf atmos (hopefully) 2020-04-30 20:25:51 -05:00
kevinz000 270f5ed168 fix 2020-04-30 18:15:43 -07:00
Detective Google 8cd5b4ff4a fixes solars + removes the space tiles in the toxins burn chamber 2020-04-30 19:21:53 -05:00
Detective-GoogleandGitHub c146c898c0 Merge branch 'master' into 91-files-changed-fml 2020-04-30 18:42:38 -05:00
Detective Google 41d1dd1763 fixes the maps 2020-04-30 18:13:02 -05:00
kevinz000andGitHub 2f236ffc04 Merge pull request #12048 from zeroisthebiggay/ilowkeydespiseatmospherics 
deautismosifies box station atmospherics
 2020-04-30 15:00:36 -07:00
kevinz000andGitHub d2b7c35ec7 Merge pull request #12057 from MrJWhit/fixes-up-singulo-room 
Links up the rad shutters in singulo engine
 2020-04-30 11:13:51 -07:00
ZeroMan 52b7086876 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-04-30 13:48:48 -04:00
kevinz000 f028672e3c Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml 2020-04-30 01:00:08 -07:00
kevinz000 72cbb77ecc fixes 2020-04-30 00:48:37 -07:00
kevinz000andGitHub 619609f5ff Merge pull request #12020 from bunny232/master 
Box pool/bar holopads+ scrubbers (that lead to space) in xenobio pens
 2020-04-29 12:01:11 -07:00
kevinz000andGitHub 1d12aa5779 Merge pull request #12006 from Trilbyspaceclone/kiloton-of-errors 
Kilo station improvements
 2020-04-29 11:59:26 -07:00
MrJWhit 7831b53932 Links up the rad shutters 2020-04-29 14:03:17 -04:00
ZeroMan 22d6ac78e1 i actually despise coding 2020-04-28 12:26:33 -04:00
ZeroMan c5107f8fe0 i actually despise coding 2020-04-28 12:25:48 -04:00
ZeroMan 041d7ce4bc i have committed warcrimes 2020-04-28 02:56:38 -04:00
ZeroMan 40f7472410 i actually despise coding 2020-04-28 02:47:28 -04:00
ZeroMan 8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00
TrilbySpaceClone 39e460d795 Kevs request 2020-04-27 07:16:00 -04:00
Artur 5d53ead547 Fucky wucky gateway and ccslab 2020-04-27 10:43:08 +03:00
kevinz000andGitHub 6ff9d54e4f Merge pull request #11947 from MrJWhit/vg-atmos-box 
Ports /vg/ atmos map for boxstation
 2020-04-25 17:01:34 -07:00
kevinz000andGitHub da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000andGitHub 7d688126c8 Merge pull request #12008 from Ghommie/Ghommie-cit707 
VR Levels are not a subset of Away Missions anymore.
 2020-04-25 16:51:52 -07:00
TrilbySpaceClone 655497be89 why didnt these save? 2020-04-25 18:17:38 -04:00
TrilbySpaceClone 5637ba3b53 more decal delettion 2020-04-25 18:12:09 -04:00
bunny232 a245741f3e Update BoxStation.dmm 2020-04-25 07:58:08 -04:00
LinandGitHub f745c59fad Merge pull request #11968 from MrJWhit/TEG-heat-go-away 
teg map hot no hot room plz
 2020-04-25 03:28:00 +00:00