mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2025-12-09 21:53:55 +00:00
2c7fb06b3d
* Squashed commit of the following: commit1f344c6689Merge:4641d3490d3c86d86539Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Thu Jul 2 18:11:18 2020 +1000 Merge branch 'master' into Snowdout commit4641d3490dAuthor: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Thu Jun 18 19:25:57 2020 +1000 map updated commitf3206af76eAuthor: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Wed Jun 17 09:04:26 2020 +1000 old edits commit685b3281b0Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Wed Jun 17 09:00:18 2020 +1000 Fix? commit5af7c8d076Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Wed Jun 17 08:53:21 2020 +1000 Revert "Update math.dm" This reverts commite64e7b1150. commite64e7b1150Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Wed Jun 17 08:50:57 2020 +1000 Update math.dm commit3df2a5c2f2Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Wed Jun 17 08:50:38 2020 +1000 Revert "Update math.dm" This reverts commit377bcf62a1. commit377bcf62a1Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Wed Jun 17 08:48:37 2020 +1000 Update math.dm commitc6a8571d2fMerge:03e323f520614887a250Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Wed Jun 17 08:41:09 2020 +1000 Merge branch 'master' into Snowdout commit03e323f520Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Wed Jun 17 08:11:40 2020 +1000 More work commitc0a0f8e5e4Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Sun Sep 15 04:10:17 2019 +1000 Update commit86289f63a6Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Tue Sep 3 15:58:38 2019 +1000 lotta progress, adds white monofloors and white floor decals commit357d1fd9f3Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Fri Aug 23 13:52:29 2019 +1000 bark commitfae862f07dAuthor: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Fri Aug 23 10:14:19 2019 +1000 weh commit95e3b75ce6Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Wed Aug 7 18:49:58 2019 +1000 Addition of cargo + other stuff but I forget what commit71e91e67c6Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Fri Aug 2 03:54:54 2019 +1000 trying to get a motion/dead detector to work commitc583b2cad6Merge:5dd927af86f1e4b938c7Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Fri Aug 2 03:44:02 2019 +1000 Merge remote-tracking branch 'upstream/master' into Snowdout commit5dd927af86Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Wed Jul 31 03:22:40 2019 +1000 Puts a ceiling over z3 to prevent atmos venting immediately commit5b696ea7bcAuthor: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Tue Jul 30 02:47:03 2019 +1000 More map stuff, groundwork for job specific things and new explorer gear commit2006ed47c0Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Sat Jul 27 20:25:37 2019 +1000 More progress, z3 near completion commit19816afff5Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Sun Jul 14 13:21:23 2019 +1000 More work, fixed some missing features, begin work on z3 commit8bb66c2d98Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Fri Jul 12 07:11:04 2019 +1000 maint vents for atmos passing/sneaky entry and other shit commitaea33f8e12Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Sun Jun 30 20:40:34 2019 +1000 LOTS OF PROGRESS WOO commitf3c77afe68Merge:ed6d3be533a55ccbe1b0Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Fri Jun 28 20:11:40 2019 +1000 Merge branch 'master' into Snowdout commited6d3be533Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Fri Jun 28 02:56:19 2019 +1000 quick update commit6c5b8fa66fAuthor: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Fri Jun 28 02:17:47 2019 +1000 Atmos basics, power gen, SMES, z-level cables, etc. SME Test. commitdbd759367bAuthor: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Tue Jun 25 10:56:17 2019 +1000 more stuff commite810f2b906Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Mon Jun 24 02:50:56 2019 +1000 More work commit6150ee79cdAuthor: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Sat Jun 22 03:21:34 2019 +1000 More stuff, more bugs commitc797576219Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Fri Jun 21 04:11:46 2019 +1000 more stuff z-levels broke commit6fb50f4e14Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Thu Jun 20 04:23:26 2019 +1000 Refresh PR page commitd649da4830Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Thu Jun 20 03:32:35 2019 +1000 Thank you update from master, very cool commit6d8d71a535Merge:d335db6afb47da2e61faAuthor: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Thu Jun 20 03:06:18 2019 +1000 Merge branch 'master' into Snowdout commitd335db6afbAuthor: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Thu Jun 20 02:10:30 2019 +1000 hmmm commita365956953Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Thu Jun 20 00:53:27 2019 +1000 oh woopse. commit0216f452d8Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com> Date: Thu Jun 20 00:48:42 2019 +1000 Part 1 - Hopefully finishing the code required * kjdvnjwvb wrmujbvbgb * ficks * updates map files * functional it compiles it werks, it all works so far but needs further work on it, todo: add departments to underground and top two floors, add the final surface z-level, fix missing icerock textures, replace single pane windows that transform into fulltiles, etc. * linters + discard phoronlock.dm * Fix missing icerock texture * medbay lobby * Update rift-04-surface2.dmm * Z-level 1, 2 touchups, updates. * more work on science * progress on med and sec + updates to engi * stuff for the map + more work * arrghghgh * weather and z-levels fixed, more progress and edits * start work on final z-level * Bar, kitchen, botany, exploration, bridge * Continue work on zlevel 5 * CI tests * emergency shuttle, cargo shuttle, ready for testmerge * delete backup files * fixing misc things * more fixes * revert accidental map changes * lateload, shuttle fixes, map additions and fixes * TGM, removal of debug areas * oops * bugfixes galore, ready for next testmerge * quick fixes * fixes so much stuff i forgot what * attempt at overmaps * Adds Barebones Plains and Cavern Zs. Step Trigger from Plains to Cavern needs work. * Try again? * Intermediate * Map Update Stage Two * map changes, z-level name changes, adjustments to turfs * z-level 5 atmos, shuttles, west plains, suits * experimental multi-json operation * All OM modernized * civilian shuttle, map fixes, work on away areas * medical shuttle, west plains, lots of fucking around * Map Tweaks and Alterations * Ha ha I'm so silly. * varedit fixes, compile fix * Update rift-03-surface1.dmm * map edits per feedback * Update rift-03-surface1.dmm * missed a spot(s) * solars, westplain outpost * fixes sky turfs, shuttles, missed cables, etc * cargo tech lockers * fixes breakers, updates engine guide * misc fixes * emergency shuttle still not fixed * engineering edits, map optimizations * actual optimizations, map edits, shuttle transits * misc map fixes * more edits * Update rift-02-underground1.dmm * update maps, fix bugs * update for new changes * more updates * Update rift-03-surface1.dmm * fix airlocks * Update rift-03-surface1.dmm * Done. * PAtches * Switching Defines Switching level defines to Triumph's all while also allowing Rift to define their turfs/areas so mappers can continue to work on it while not being active. * regex * t * regex * more * fix * wack * a * let's do this * fix * woops * why are we modifyingtiurmph landmarks?? * fix * do that * dme * fixes frostlocks, maint changes (#4005) * test * test * WACK * GIT WHY * fixes the airlocks for real (hopefully), adds a gantry to sec observation (#4010) * fixes frostlocks, maint changes * fixes the airlocks for real, adds a gantry * fix * fix airlocks platinum redux fix harder edition (#4014) * fixes frostlocks, maint changes * fixes airlocks: Fix Harder Platinum Edition Redux * fixes * fix * whole bunch of map updates (i forgot them) (#4027) * adds more cameras, fixes the AI core, updates bunker (#4033) * Trade Pad * Ha ha, I broke it. * Fixies * regexing * regexing * Overmaps Fixes * Fixes to Tradepost * More Tradeport Fixes * fix * Fixing Wires * Reshuffling for Canyon Floor * Console Fix * Sec EVA Equipment, Cafe improvements, various bugfixes (#4052) * Sec EVA equipment, cafe improvements, bugfixes * fixes misplaced copy pastes * Update rift-05-surface3.dmm * Update rift-05-surface3.dmm * Automatic changelog generation for PR #4052 [ci skip] * Fix? * One more tweak. * JSON fix. * Let's hope this works. * fixes errored space tiles, adds linter checks to forbid fuckups (#4057) * wow you guys are bad * maybe not that * Trade Post and MultiZ fixes. * Fixes Weather * Fixes Mecha Hovering? (It does but I haven't fully checked it for exploits.) * I am dumb, this does what the above commit was supposed to. * why is this GONE * fix * convert * Map Adjustments * fix * Wild! * Disposals * Disposals and Mail * Removes Engineering Tape - Silly Me * Refinements to Trash Pit * Corrects Missing Doors and Piping Concerns * Adds More Missing Airlocks * Adds Xenobio and Fixes Disposals Issues. * Disposals Final Pass * Actual Disposals Last Pass * done * Update rift-03-surface1.dmm (#4090) * Depth Simulation and Rearrangement * Removes Eng/Atmos Stasis Bags, Adjusts Atmos Pipe Issue, Fixes? Telecomms Air Alarm, Adds HoP Door * fuck off * Charles wedge atlas livestock (#4133) * Create temp * pretty up the rift.json this may prevent indent errors * Delete temp * Add files via upload * Adds Lythios Genetically Engineered Lifestock Three creatures that NT is using Lythios to test. The Woolie, The Glacicorn and the Furnace Grub. * Cargo Packs for Lythios Experimental Lifestock * Animal Sprites * Oops Forgot to Edit the .dme * Automatic changelog generation for PR #4133 [ci skip] * Fixes Atlas West Caves (#4134) * Create temp * pretty up the rift.json this may prevent indent errors * Delete temp * Add files via upload * Fixes Several things with the west region. Caves now stack properly, everything has stairwells and caves levels. The Stairs on the surface now face the right way. West Deep now has proper areas. Etcetera. * Renormalizing Checking to See if this changes anything * Automatic changelog generation for PR #4134 [ci skip] * why (#4126) * wild (#4138) * y * Various Atlas Map Fixes, Addition, Tweaks. (#4142) * Create temp * pretty up the rift.json this may prevent indent errors * Delete temp * Add files via upload * New Turbolift Mining Turbolift * Map Changes and Fixes Galore * Evil SMES Variables * Oops messed up Depth Sim * Renomalizing * Lift Areas Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> * Automatic changelog generation for PR #4142 [ci skip] * gamers i keep saying dont touch these * raises map temp to -50 to -20C instead of -170C (#4149) * Update _lythios43c.dm * fix * asfdsasfd Co-authored-by: AnalWerewolf <50751907+AnalWerewolf@users.noreply.github.com> Co-authored-by: AnalWerewolf <kaithewolfy@gmail.com> Co-authored-by: Captain277 <agentraven16@gmail.com> Co-authored-by: fake_vm_user <fake_vm_user> Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com> Co-authored-by: CharlesWedge <52897649+CharlesWedge@users.noreply.github.com>