shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,761 Commits 5 Branches 0 Tags
8f44cf13054a30638fb8edf8564d7643e4afc749
Commit Graph

1537 Commits

Author SHA1 Message Date
Detective Google
8f44cf1305 PR TIME WOOO 2020-05-09 00:59:40 -05:00
Detective Google
9f25759aa8 Citsnow -> final name (Snaxi) , fixes arrivals 2020-05-09 00:53:04 -05:00
Detective Google
375375d67e brig 2020-05-08 18:19:29 -05:00
Detective Google
78e1fcc772 I can't feel my toes 2020-05-08 03:31:36 -05:00
Detective Google
4e84b92e2e Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-08 01:13:12 -05:00
Detective Google
504b1762f4 more map 2020-05-08 00:57:42 -05:00
Detective Google
5b6229d1e0 more stuff 2020-05-07 22:10:59 -05:00
Detective-Google
bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002) 
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
 2020-05-07 14:46:16 +02:00
Detective Google
eaf486dbaa more epic progress 2020-05-06 16:17:05 -05:00
MrJWhit
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
MrJWhit
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-Google
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
kevinz000
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
MrJWhit
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
MrJWhit
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
MrJWhit
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-Google
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
kevinz000
2f236ffc04 Merge pull request #12048 from zeroisthebiggay/ilowkeydespiseatmospherics 
deautismosifies box station atmospherics
 2020-04-30 15:00:36 -07:00
kevinz000
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
kevinz000
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
kevinz000
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