Commit Graph

1568 Commits

Author SHA1 Message Date
Detective Google 6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05:00
Detective Google 4f75358ab3 maint bar barricades no longer take 50 years to break 2020-05-12 17:17:12 -05:00
Detective Google 948081fdce outdoor lights, rad protection 2020-05-12 17:13:23 -05:00
kevinz000 e0f1b65785 Merge pull request #12209 from MrJWhit/moving-fire-alarm-in-boxstation-chemistry
Moves fire alarm in box station in the chem department
2020-05-12 12:28:41 -07:00
Ghommie 84af9d9d40 wtf 2020-05-12 21:12:17 +02:00
Ghommie 757706653d Map paths. 2020-05-12 21:01:34 +02:00
Ghommie 7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Arturlang 0b03958136 Makes The syndi outpust tanks work (#12228) 2020-05-12 18:31:33 +02:00
Detective Google 2edfcada4c adds a medlathe 2020-05-12 05:03:41 -05:00
Detective Google 10cd4320a7 gaytway 2020-05-12 04:40:18 -05:00
Detective Google ad1a03d679 chem unfuckery 2020-05-12 02:04:12 -05:00
Detective Google 8f06ae3c56 Q-pads and disposals tune ups 2020-05-11 22:53:32 -05:00
Detective Google dc931490fd disposals needs a recycler 2020-05-11 21:38:49 -05:00
Detective Google 88f87a444d spare out of locker 2020-05-11 21:09:29 -05:00
Detective Google bcd30a9838 more requested fans 2020-05-11 21:06:20 -05:00
Detective Google 7cb79695c5 first round of testing fixes 2020-05-11 21:04:46 -05:00
Detective Google bfde367c4e Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-11 20:56:42 -05:00
Detective Google 4bac8befd2 atmos TEG needs a sparker 2020-05-11 00:28:30 -05:00
MrJWhit b5a18ccba5 should be good??? 2020-05-11 00:09:25 -04:00
Detective Google d0a67d3312 in my infinite wisdom I forgot air sensors in the atmos tanks 2020-05-09 22:26:30 -05:00
Detective Google 424133c48a adds the actual snow taxi to snaxi 2020-05-09 22:20:26 -05:00
Detective Google dd41c6c7c2 snow cabins galore 2020-05-09 20:59:04 -05:00
Detective Google beeeebc716 maint bar 2020-05-09 20:54:21 -05:00
Detective Google 2641e3d6b8 cameras 2020-05-09 20:10:54 -05:00
Detective Google 1d298232eb adds Snowmobiles, (ATVs that move fullspeed on snow and slow on plating) 2020-05-09 20:06:25 -05:00
Detective Google f844587652 missed an engi spawner 2020-05-09 18:46:53 -05:00
Detective Google b95d83e65d engi ruin can keep the hardsuits since they're not nearly as powerful on this map. 2020-05-09 17:39:46 -05:00
Detective Google 57b18a8527 fat nerfs a bunch of ice ruins 2020-05-09 17:34:52 -05:00
Detective Google 976137d196 solars are now a thing 2020-05-09 17:28:50 -05:00
Detective Google e4f06b98d2 remove cable dirs 2020-05-09 02:03:31 -05:00
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
MrJWhit 2a9746b34a Pubby atmos opening up (#12117)
* First update, atmos control room

* finalization

* Final bugfixes

* final update
2020-05-09 02:55:07 +02: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