Commit Graph

15 Commits

Author SHA1 Message Date
Captain277
c6d0f8d35e Fixes Weather Timers (#4348) 2022-08-11 05:58:30 -07:00
Captain277
49e28883cd Fixies uwu (#4333) 2022-08-08 01:46:21 -07:00
silicons
60317c9e4a Update _rift_submaps.dm (#4327) 2022-08-06 09:21:02 -07:00
silicons
934ad25bfe refactors: inventory, mousedrag, stripping, species bodytypes, inventory HUD, and probably some unrelated things (#4092)
* start

* i hate people who pack shit into one file

* sigh

* regex

* inventory rework

* stubs

* regex

* this is insanity

* oh no

* backend moment

* a

* changes

* wild

* regexing

* changes

* put in hands

* more errorS

* attackby

* more helpers

* replacements

* wild

* fixes

* pain

* fxies

* fixes

* unneeded

* ape

* ape

* wild

* wild

* more

* wild

* there

* fixes

* fixes

* l

* wild

* more

* moer

* fixes

* enough for todayd

* regexing

* long time coming

* shaking and crying

* end me

* fixes

* fixes

* e

* fxies

* rig refactor moment

* fixes

* fixes

* fixes

* fixes

* out with the shitcode

* thanks git

* partial rig rewrite here we go

* more

* fixes

* WWWW

* ok

* wild

* bitfield defines

* nobludgeon

* pain

* pain

* fixes

* more

* wild

* wild

* fixes

* pain

* move behaviorsr

* fixes

* next up, finishing core procs

* y

* .

* time to finish this

* time to finish this

* propagate accessories

* hate this accursed engine

* hate this accursed engine

* pain

* more

* cancer

* epic

* genuinely hate

* wild

* that

* why

* circuitry is my bane

* y

* how

* sort

* logging

* logging

* im dying

* fixes

* next

* f

* more

* epic style

* fixes

* on meta

* fix

* wild

* uh

* quirky

* fixes

* agh

* pain

* fixes

* fix

* sigh

* a

* epic1

* fixes

* ugh

* epic

* fixes

* uhh.

* is this even a fix

* fix

* fixes

* fixes

* we love optimization

* wear over system

* correct

* worn over stuff

* just augments

* coggy

* implant magnetic catch

* implant magnetic catch

* fixe

* a

* g

* t

* fix

* fix

* wack!

* fix

* a

* semantics

* fix

* that

* fixes

* handle denesting

* w

* fixes

* e

* bugs

* fixes

* fixes

* unit tests

* absolutely wild

* fixes

* fix

* fix

* fixes

* on god this is bad

* fixes

* fixes

* fix

* fix

* wacky!

* fix

* wack

* manual

* fixes

* closets

* OOPS

* wack

* pain

* pain

* flags

* regex

* fixes

* wakc

* changes

* more

* augh

* more

* replaces

* more

* that

* acc

* acc

* fix

* fix

* fix

* oh woops that was important

* wack

* epic

Co-authored-by: fake_vm_user <fake_vm_user>
Co-authored-by: VM_USER <VM_USER>
2022-07-29 00:20:47 -07:00
FreeStylaLT
4f81116fef A large variety of map changes (#4264)
* bunch of map updates

* fixes and missing maint blobs

* removes hop windows to maint ol

* more fixes

* cable fix for bridge power

* fixes

* insane amount of changes to xenobio and shit

* fixes fixes

* ceilings and leaks

* cable and atmos fixes for xenobio

* cant believe its more fixes

* minor fixes

* minor surface 1 sci updates

* fixes xenobio vertical connection

* fixes
2022-07-25 19:03:22 -07:00
CharlesWedge
88d7874868 More Western Points of Interest (#4213)
* Map Load Things

* Renormalize

* Hotfix For Chess Pieces

Chess Pieces Should Now Pass Through eachother and players

* Fuck it we are removing Density for Cutouts

how dense can a wooden standee be anyway?

* Screw it I am doing it properly

Why did I make them structures to begin with?

* fixes

* Chess Pieces Structure>Item

* Removing Chess Structures

Shouldn't have done it in the first place

* Renormalizing Map Changes

* redoing this

* Cheesboard Done Right

I apparently inverted the chessboard (Give me a break its been like 6 years since I have played chess).

* Renormalizing

* More Set Peices in the West Plains

Nuke Town, Bunker Buster Test Site, Mine Shaft, Checkpoint, landing pad, roads...

* Lythios Animal Spawner and New Areas

* Spell Check Updates Mobs for New Atmos

* Area Cleanup and Note Fixing.

* Interior Exterior Turf Fixes...

* Mimic Reduction

I went overboard with my floor mimic babies

* Fixes Reactor Pitt

whoever replaced the reactor with open turfs with skyfall turfs should really come forward and apoligize to all the players that fell in it
2022-06-27 20:51:24 -07:00
Captain277
c2e01d7ed9 Adds a Public Garden (#4212)
* Public Garden Rev 1

* Forgot the ceiling.

* Forgot the Gift Vendors too. Aaa.

* Forgot to connect it to the powernet.

* Completely repositions the garden.

* Adds some more lights, and fixes an open turf weather issue.

* Fixes Fishing. Adds Duckies.

* Garden Lighting, Fairy Lights, Airlock Fix for 6 and 4, Barsign Revisions

* Reroutes air pipe connected to civilian surface airlock, as previous route was too visible.

* Community Suggestion Updates - Box of Glasses for Gantry, Picnic Area for Garden

* Park style grills, courtesy of Huey!

* Fixes space turf.

* Bumps lighting back up to 5.

* Fixes minor Area misalignment.

* Fixes Fish and Prosfab Dir
2022-06-20 18:07:04 -07:00
silicons
3085c68890 [MDB IGNORE] repaths landmark back to /obj because I apparently am an idiot (#4197)
* oops

* why

* here you go

* oops
2022-06-14 14:58:22 -07:00
Captain277
66fb754ec3 Adds Fighter Bay and Fixes(?) Skyfall (#4177)
* Fighter Bay Addition

* Refinements to Hanagar

* Stocking Pinnace

* Marker Light Adjustments - WIP

* Marker Lights and Firelocks

* Refactors Skyfall Turfs, I guess!

* Adjusts skyfall turfs some more, and sets them to properly simulate depth and drop.

Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2022-06-12 04:05:12 -07:00
AlphaM01
a823956d5d Adds Aux Landing Pads, gravel paths, seamless snow edge overlays. (#4187)
* Aux Pads 1/2 initial

structure + landmarks
no idea if it works
no paths

* adresses staircase-induced noclipping

and adds solid ground where I'd forgotten it
+ another path off aux pad 2.

* added plating to walkways

hopefully fixes the last of the noclipping issues on diagonals

* adds snowy gravel terrain, decals, paths

snowy gravel turf is maybe set up weirdly?
new snow/edges decals that use the same snow texture as the ground on rift, this way they can connect directly to snowy terrain without looking ugly. (also available for the snowy gravel)
Hopefully will come in handy for caves and the like as well.
Mapping largely done (pads need testing)
Still need walking sounds

* moves outdoors/gravsnow from flooring_premade.dm to snow.dm

Also gives it (hopefully) footstep sounds there.
Since this probably shouldn't use the decl version?

* Fixes step sounds on gravsnow

Just doing what the snow does, since clearly that works and the other stuff does not.

* adds a single missing railing

holding on further changes, just noticed a missing railing.

* removes pad landmarks, adds wall pillars

After testing I've run out of ideas on how to make this work.
rwall pillars have been added to restrict the size of shuttles attempting to land on the pads in the future.

* Hopefully fixes map conflicts

copied map changes onto latest

* newlines

* Deletes unused shuttle landmarks

Having many airlock troubles trying to land shuttles in the planet atmos.

Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2022-06-11 22:13:21 -07:00
Captain277
ca3a0068fe CentCom Rename (#4188) 2022-06-10 22:07:53 -07:00
CharlesWedge
aa3c59895f Weather And Ore Attempt 2 (#4172)
* Map Load Things

* Renormalize

* Hotfix For Chess Pieces

Chess Pieces Should Now Pass Through eachother and players

* Fuck it we are removing Density for Cutouts

how dense can a wooden standee be anyway?

* Screw it I am doing it properly

Why did I make them structures to begin with?

* fixes

* Chess Pieces Structure>Item

* Removing Chess Structures

Shouldn't have done it in the first place

* Renormalizing Map Changes

* redoing this

* Cheesboard Done Right

I apparently inverted the chessboard (Give me a break its been like 6 years since I have played chess).

* Renormalizing

* Update rift_defines.dm

* WE WILL DO THIS AGAIN
2022-06-10 17:48:40 -07:00
CharlesWedge
835209dd27 The Lythios Facility Emerges (#4160)
* Squashed commit of the following:

commit 1f344c6689
Merge: 4641d3490d 3c86d86539
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jul 2 18:11:18 2020 +1000

    Merge branch 'master' into Snowdout

commit 4641d3490d
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 18 19:25:57 2020 +1000

    map updated

commit f3206af76e
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 09:04:26 2020 +1000

    old edits

commit 685b3281b0
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 09:00:18 2020 +1000

    Fix?

commit 5af7c8d076
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:53:21 2020 +1000

    Revert "Update math.dm"

    This reverts commit e64e7b1150.

commit e64e7b1150
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:50:57 2020 +1000

    Update math.dm

commit 3df2a5c2f2
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:50:38 2020 +1000

    Revert "Update math.dm"

    This reverts commit 377bcf62a1.

commit 377bcf62a1
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:48:37 2020 +1000

    Update math.dm

commit c6a8571d2f
Merge: 03e323f520 614887a250
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:41:09 2020 +1000

    Merge branch 'master' into Snowdout

commit 03e323f520
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:11:40 2020 +1000

    More work

commit c0a0f8e5e4
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Sun Sep 15 04:10:17 2019 +1000

    Update

commit 86289f63a6
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Tue Sep 3 15:58:38 2019 +1000

    lotta progress, adds white monofloors and white floor decals

commit 357d1fd9f3
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Aug 23 13:52:29 2019 +1000

    bark

commit fae862f07d
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Aug 23 10:14:19 2019 +1000

    weh

commit 95e3b75ce6
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Aug 7 18:49:58 2019 +1000

    Addition of cargo + other stuff but I forget what

commit 71e91e67c6
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Aug 2 03:54:54 2019 +1000

    trying to get a motion/dead detector to work

commit c583b2cad6
Merge: 5dd927af86 f1e4b938c7
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Aug 2 03:44:02 2019 +1000

    Merge remote-tracking branch 'upstream/master' into Snowdout

commit 5dd927af86
Author: 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

commit 5b696ea7bc
Author: 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

commit 2006ed47c0
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Sat Jul 27 20:25:37 2019 +1000

    More progress, z3 near completion

commit 19816afff5
Author: 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

commit 8bb66c2d98
Author: 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

commit aea33f8e12
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Sun Jun 30 20:40:34 2019 +1000

    LOTS OF PROGRESS WOO

commit f3c77afe68
Merge: ed6d3be533 a55ccbe1b0
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Jun 28 20:11:40 2019 +1000

    Merge branch 'master' into Snowdout

commit ed6d3be533
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Jun 28 02:56:19 2019 +1000

    quick update

commit 6c5b8fa66f
Author: 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.

commit dbd759367b
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Tue Jun 25 10:56:17 2019 +1000

    more stuff

commit e810f2b906
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Mon Jun 24 02:50:56 2019 +1000

    More work

commit 6150ee79cd
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Sat Jun 22 03:21:34 2019 +1000

    More stuff, more bugs

commit c797576219
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Jun 21 04:11:46 2019 +1000

    more stuff z-levels broke

commit 6fb50f4e14
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 20 04:23:26 2019 +1000

    Refresh PR page

commit d649da4830
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 20 03:32:35 2019 +1000

    Thank you update from master, very cool

commit 6d8d71a535
Merge: d335db6afb 47da2e61fa
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 20 03:06:18 2019 +1000

    Merge branch 'master' into Snowdout

commit d335db6afb
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 20 02:10:30 2019 +1000

    hmmm

commit a365956953
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 20 00:53:27 2019 +1000

    oh woopse.

commit 0216f452d8
Author: 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

* temporary file

* Delete temp

* Adds New Set Piece Facility

Who wants to explore a frozen nuclear disaster site!

* Lythios Facility Areas

* New Rad Emitter Level

Since 100 Bqs does was not enough

* Fixes Formatting On Lore Paper

* Grammar Fix on Custom Description

* More Grammar Fixin

* Fixed unescaped \'s in a paper's info string

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: Zandario <Zandarioh@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>
2022-06-08 16:14:14 -07:00
Zandario
2c7fb06b3d God damn Snow/Blizzard Ambience! I am going to go numb by the silence! (#4165)
* Squashed commit of the following:

commit 1f344c6689
Merge: 4641d3490d 3c86d86539
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jul 2 18:11:18 2020 +1000

    Merge branch 'master' into Snowdout

commit 4641d3490d
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 18 19:25:57 2020 +1000

    map updated

commit f3206af76e
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 09:04:26 2020 +1000

    old edits

commit 685b3281b0
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 09:00:18 2020 +1000

    Fix?

commit 5af7c8d076
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:53:21 2020 +1000

    Revert "Update math.dm"

    This reverts commit e64e7b1150.

commit e64e7b1150
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:50:57 2020 +1000

    Update math.dm

commit 3df2a5c2f2
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:50:38 2020 +1000

    Revert "Update math.dm"

    This reverts commit 377bcf62a1.

commit 377bcf62a1
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:48:37 2020 +1000

    Update math.dm

commit c6a8571d2f
Merge: 03e323f520 614887a250
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:41:09 2020 +1000

    Merge branch 'master' into Snowdout

commit 03e323f520
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Jun 17 08:11:40 2020 +1000

    More work

commit c0a0f8e5e4
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Sun Sep 15 04:10:17 2019 +1000

    Update

commit 86289f63a6
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Tue Sep 3 15:58:38 2019 +1000

    lotta progress, adds white monofloors and white floor decals

commit 357d1fd9f3
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Aug 23 13:52:29 2019 +1000

    bark

commit fae862f07d
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Aug 23 10:14:19 2019 +1000

    weh

commit 95e3b75ce6
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Wed Aug 7 18:49:58 2019 +1000

    Addition of cargo + other stuff but I forget what

commit 71e91e67c6
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Aug 2 03:54:54 2019 +1000

    trying to get a motion/dead detector to work

commit c583b2cad6
Merge: 5dd927af86 f1e4b938c7
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Aug 2 03:44:02 2019 +1000

    Merge remote-tracking branch 'upstream/master' into Snowdout

commit 5dd927af86
Author: 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

commit 5b696ea7bc
Author: 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

commit 2006ed47c0
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Sat Jul 27 20:25:37 2019 +1000

    More progress, z3 near completion

commit 19816afff5
Author: 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

commit 8bb66c2d98
Author: 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

commit aea33f8e12
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Sun Jun 30 20:40:34 2019 +1000

    LOTS OF PROGRESS WOO

commit f3c77afe68
Merge: ed6d3be533 a55ccbe1b0
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Jun 28 20:11:40 2019 +1000

    Merge branch 'master' into Snowdout

commit ed6d3be533
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Jun 28 02:56:19 2019 +1000

    quick update

commit 6c5b8fa66f
Author: 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.

commit dbd759367b
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Tue Jun 25 10:56:17 2019 +1000

    more stuff

commit e810f2b906
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Mon Jun 24 02:50:56 2019 +1000

    More work

commit 6150ee79cd
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Sat Jun 22 03:21:34 2019 +1000

    More stuff, more bugs

commit c797576219
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Fri Jun 21 04:11:46 2019 +1000

    more stuff z-levels broke

commit 6fb50f4e14
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 20 04:23:26 2019 +1000

    Refresh PR page

commit d649da4830
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 20 03:32:35 2019 +1000

    Thank you update from master, very cool

commit 6d8d71a535
Merge: d335db6afb 47da2e61fa
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 20 03:06:18 2019 +1000

    Merge branch 'master' into Snowdout

commit d335db6afb
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 20 02:10:30 2019 +1000

    hmmm

commit a365956953
Author: AnalWerewolf <AnalWerewolf@users.noreply.github.com>
Date:   Thu Jun 20 00:53:27 2019 +1000

    oh woopse.

commit 0216f452d8
Author: 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>
2022-06-08 16:13:09 -07:00
silicons
183b2f4cab [IDB IGNORE] [MDB IGNORE] dev-merge: NSB Atlas (#3963)
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
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: Zandario <Zandarioh@gmail.com>
Co-authored-by: fake_vm_user <fake_vm_user>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
Co-authored-by: CharlesWedge <52897649+CharlesWedge@users.noreply.github.com>
2022-06-07 18:51:58 -05:00