Commit Graph

14 Commits

Author SHA1 Message Date
MrJWhit 55a58ba76c Fixes pipe to turbine (#12346) 2020-05-28 00:37:36 -07:00
Ghom 0a6b755eff Apotechary chem dispenser nerf. (#12292)
* Apotechary chem dispenser nerf.

* Spelling and build_path.
2020-05-24 13:20:32 -07:00
Ghom 293e3fea28 Removing that maint dorm carbin beside the disposal room, and excess wardrobe. (#12308) 2020-05-24 13:12:18 -07:00
Ghom 6756b564b7 Removing that one keg. (#12333) 2020-05-24 13:07:53 -07:00
Ghom ab5d65a454 Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
2020-05-24 13:05:15 -07:00
MrJWhit 861734d119 Updates icebox atmos to box atmos (#12299) 2020-05-20 18:47:54 -07:00
Trilbyspaceclone b21fb97bda Some fixes, some addtions some harm - Ice box changes (#12147)
* Some fixes, some addtions some harm

* Update icemoon_surface_engioutpost.dmm
2020-05-15 07:54:25 -07:00
Ghommie fc5d5fb087 Moving buttons away from windows. 2020-05-14 00:23:47 +02:00
jjpark-kb 1e0f30a446 [Map Edits] Minimal Piping/Device Fixes (#12239)
* map fixes

* reverting delta fix for PR conflict
2020-05-13 20:56:56 +02: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 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
MrJWhit b5a18ccba5 should be good??? 2020-05-11 00:09:25 -04: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