Commit Graph

969 Commits

Author SHA1 Message Date
Captain277
49982f23fa These don't belong here. 2021-09-12 08:44:08 -07:00
CharlesWedge
b097467999 Hopefully Fixes Sunlight in the Desert, Fixes Roach Spawn (#3325)
* Map Load Things

* Hopefully Fixes Sunlight in the Desert.

Funny Story when this was TMed I only was checking on it at night. This should hopefully make sure Day in V-4 Desert is actually Day.

* Fixes Roach Infesation

* Underscore
2021-08-14 21:20:49 -07:00
CharlesWedge
e75c11519b Add files via upload 2021-08-05 10:53:43 -05:00
CharlesWedge
54c485393d more lateload stuff 2021-08-05 10:45:43 -05:00
CharlesWedge
dd42093e3d Tether Remap Part 3 of X: Surface Tether: Attempt 2 (#3288)
* Updated Tether Surface Map

Consolidation Edits Included

* New Areas and V-3b Turfs

* One more thing for Mime

A Bottle of Nothing

* Adds Maurice

* missed bar backroom

* Last Minute Sauna Area Edit

* Oops Forgot this area was added

* Oops changed some areas back to pre-consolidation

* Icon State Oops

* Gift Vendor on Deck 2

As requested by Captain

* Former Chapel Area Now "Maint"

We should not have 2 separate areas known as "Chapel".
Trash and junk also added

* Disables the Looking Glass, Fixes Sauna Rain

water/indoor apparently is an outdoor turf

* misc fixes for deck 1

* Grammar Fix

No bad spacing in Maurice's Description

* Access Fixes

Xenobotanists can now open lockers in Xenobotany, Tram Holding Cell is now secure.

* Theoretical Fix to Shields Generating on Paths...

Doesn't Break Code as far as I know... Was checked with VSC and Dreammaker

* Fixes Former Looking Glass Runtime

Turfs Cry out for their landmark: Noisily.

* Modifies Tram Safety Glass

Now Uses Windoor/Glass Combo that is not deleted upon tram arrival.

* I hope this fixes my version of surface 1

* Fish Pond Fix Part 1

Water/indoors is now actually an indoor turf

* Fish Pond Fix Part 2

Creates a "Not Outdoors Variant of Sand"

* Fish Pond Fix Part 3

Fish Pond is no longer "Outdoors" and will not be effected by outdoor weather

* fixes the Tram Station Windoors

Misaligned by 1 tile

* Perhaps actually fixes Looking Glass Runtime

* Reverts Sauna Changes

Happy?
2021-07-28 08:28:23 -07:00
Lin
6c2f1cadb9 Fixes to the plantery day/night cycles and weather effects (#3283)
* fix planetary systems

* you know what this looks way nicer
2021-07-24 14:42:53 -07:00
Captain277
4045b6277e Consolidates Asteroid into 2 Z Levels (#3269)
* Map consolidation phase one.

* I don't know why, but VSC is forcing me to commit these files, and will not acknowledge that I've not changed them.

* It's doing it again?

* Quick lighting and cosmetic fixes.

* Missed a pair of parens.

* Fixes multiple bugs, and renames Tether Lift areas.

* Adjusts wiring layout oversights.

* Removes spawn points ahead of full wipe.

* Pipe adjustment

* Delete tether_underdark.dmm

* Delete tether_misc.dmm

* Delete tether-09-solars.dmm

* Delete tether-08-mining.dmm

* Fixes Space Turf bug, adjusts wiring and pipes.

* Piping adjustments. Incomplete.

* Disposals and Mail pipenet repairs. Complete.

* Bartender Equip and Grav Gen Door Alignment

* Adds cameras to some new areas.

* Disables Z7 and Fixes Pipe Network

* Deletes Z7 and Partially Updates NanoUI Maps

* Updates relevant .dms to remove references to Station 3.

* Level 2 Area Corrections.

* Elevator fix, active turf fix.

* JASON!

* Corrects Area bug affecting Linter.

* Mech Air Ports. Last tweak.

* Tweak to Mining to test.

* Repairs strange offset bug, hopefully.

* Attaches a power cable.

* Fixes PF Area issue.

* The for real final update. Almost forgot this.
2021-07-23 03:46:05 -05:00
silicons
663b919445 [IDB IGNORE] [MDB IGNORE] Tether - remade on cit repo so people can PR to this (#3043)
* Tetherport

* sigh

* more fixes

* shields

* more

* woo

* compile

* e

* a

* Tether, compilable and running

not playable tho

* Tether, compilable and running

not playable tho

* Automatic changelog generation for PR #3200 [ci skip]

* why

* EOL

* nukes edited areas. if you had something important in here, you didn't deserve to.

* another folder down

* one more folder

* the refacotring continues

* change those

* okay

* dynamic zlevels

* move stufF

* reorganize that too

* get rid of unneded archives

* move talon too and rename that

* meh

* woop

* fixes

* move those

* fixes

* fix

* Submap Repathing/Reconciliation

* Attempts to fix Gecko invalid variable bug.

* Alright. Let's actually fix every bugged instance.

* Another round of updates. That same turf issue exists.

* Should fix the last of those weird varedits.

* One snuck by?

* Another round of fixes.

* I want to know who put all these var edits in.

* Another batch down.

* Yet another batch.

* A map at a time, at this rate.

* I hope these are the last four, but probably not.

* Hopefully the last, but probably not.

* ANOTHER stealth var_edit that snuck through.

* Manually checked the rest of the map files I found. These were updated.

* Did the same for bad var_edits. Caught these.

* Updates the 140x140.

* Sorts Talon and partially adds Point Defense. Too complex for me.

* tether_turfs

* I think this is it. The last variable bug.

* Telenetwork Delenda Est

* linterS

* fix

* extraneous files

* woo

* mmm

* add that in until reagents hardsync

* woo

* sync

* updates

* t

* weather

* i want to rewrite telecomms

* test

* shift those

* woo

* move that

* FUCK

* Fix

* fix

* or null

* shuffle

* Fixes

* Fixes

* Fix

* fixes

* woo

* that

* facility safety

* that too

* move that out

* fixes

* woops /

* rename those

* those

* woo

* test

* fixes

* woo

* exploration map edits

changes oxygen tanks to o2 jetpacks, co2 jetpack to an o2, adds pathfinder voidsuit, suit cycler for medical, and fixes access restrictions on the PF's office and locker

* mh

* Update fueldepot.dmm

* woo

* woo

* woo

* fix

* utterly fuck you

* Automatic changelog generation for PR #3225 [ci skip]

* test code

* w

* that

* fieldgens

* better

* singulo

* fixes

* fix

* fix

* adds mirrortools, removes backup implants

* why

* Prevents falling through catwalks and lattice,
stolen from Silicons

* Lots of stuff!

* Update talon2.dmm

* Automatic changelog generation for PR #3226 [ci skip]

* Removes Mining Stacker

* Slight remap changes to Deck 3, pending more.

* Automatic changelog generation for PR #3228 [ci skip]

* fix that

* that

* R&D remap.

* Lighting fix and correcting a talon vault issue?

* Conflict clean-up.

* Multi-floor modifications. Chem change. R&D revert. Etc.

* Adds a few extra timeclocks.

* Missed the bioregens. Hooray.

* Re re readjusts R&D to a lobby design. Adds Space Spice. Maybe fixes Captain spawner.

* woo

* fix

* not that

* Xenobotany and Trash Pit adjustments.

* proper

* De-militarizes Talon. Will Trader-ify them when I wake up.

* fix

* fix

* ashet pls

* ashet pls v2

* cleaner

* cleaner

Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
Co-authored-by: Captain277 <agentraven16@gmail.com>
Co-authored-by: Mag <86886852+MonaraMir@users.noreply.github.com>
Co-authored-by: nik707 <38332985+nik707@users.noreply.github.com>
Co-authored-by: TheLordME <58342752+TheLordME@users.noreply.github.com>
2021-07-11 23:29:24 -07:00
silicons
966bc2474f ports new communicators from vorestation (#3157)
* tragic

* sync

* woo

* find replace

* more

* poggy

* woo

* sigh

* new

* ok

* woo

* comms fix, crew manifest disabled for now

* sigh

* fine i won't go past 120
2021-06-06 12:03:24 -07:00
silicons
92bd9513b0 fix (#3141) 2021-06-02 13:59:45 -05:00
silicons
1b8857be07 runtimes 2021-05-28 06:58:25 -07:00
silicons
e59d4272cc shoo 2021-05-28 04:43:56 -07:00
nevimer
7df619241c Burn chamber engine
Adds the burn chamber engine.
2021-05-04 12:20:12 -07:00
buffyuwu
e67da9e479 lets not spam THUNDERDOME.ogg indefinitely in the holodeck (#2995)
* lets not spam THUNDERDOME.ogg indefinitely in the holodeck

* Update HolodeckControl.dm

ok thunderdome can have thunderdome.ogg

* Update triumph_things.dm
2021-04-20 09:13:49 -07:00
buffyuwu
b3a04f53bd minor changes (#2971)
* minor changes

* minor text fix
2021-04-16 15:38:55 -07:00
silicons
126739fc8a Merge pull request #2959 from Kraseo/mapicons
makes area icons (objectively) significantly better
2021-04-16 04:43:15 -06:00
buffyuwu
cf6fcbc765 unsquishes minitest and adds emote stuff from main (#2949)
* unsquishes minitest and adds laugh stuff from main

🆑
fix: unsquishes minitest (dev)
add: adds laugh sounds from main
add: adds a *nyaha emote separately
/🆑

* add a help entry bc why not

* trailing newlines for linters

* ports screaming from main

* ports spam_flag from main

* this is better than having a separate PR and using the living.dm stuff

* after maint talk, better that this doesnt exist until it can be implemented nicer
2021-04-12 21:07:54 -05:00
Kraseo
48ae50b7a5 update 2021-04-11 23:48:58 +02:00
silicons
5823fb93e7 migrates to github actions + sync tgui to main's, removes a bunch of dead maps and code and reworks how submap loading is done (#2917)
* move phoronlock define

* t

* force rename

* nuke unneeded things

* don't do that

* tgui sync?

* changes

* unit testing module

* backend

* tools update

* aaah

* go and stay go

* path replace

* move everything

* toss out more stuff

* remove

* fine those can stay

* dependencies.sh

* ruin datum move + rename

* level assets why did you guys put the turfs in my atmosphers folder grr

* more moving

* basemap, force stuff

* fix that desync meme

* move more stuff

* move those too

* repath

* get rid of useless initializers

* hacky patchy

* reservations

* alright

* tgui

* changelog example

* checksum

* md5

* errors

* more

* turf empty

* stop

* fix

* bad kwarg

* let's get those in again

* alright

* rid of that

* huh

* newlines

* newlines

* folder

* mood

* woops

* readme

* might as well trim now

* let's go

* fuck it tether isn't being used anyways lol

* ok

* empty files go

* tether is demoted

* sorry but this goes too

* okay

* make that work too

* ok

* wow.

* whew

* Fix

* fixes

* ok

* sigh

* fix

* fix

* aah.

* rust_g logging

* update rust g file

* fix

* funny

* Fix

* map issues

* fix

* initialize hints

* solves some problems

* those too

* ok

* pills

* let's do that.

* hit that too

* runtime

* add that too

* alright

* fix

* fix

* fix

* Fix

* add

* fix

* wildwest, what have they done to you...

* do that too'
git push

* fixes

* fixes

* fixes

* pack this tightly

* let's not have empty files

* sigh

* fix

* FUCK OFF

* fix icon

* rip old mapmerge

* zz

* woo yeah woo yeah

* logging

* fix

* better logs

* GRRRRRR

* last commit??

* awful
2021-04-01 16:07:03 -05:00
silicons
aa189af649 Update engine.dm 2021-03-27 19:13:04 -07:00
nik707
bf17f46723 Merge pull request #2887 from Enzo-Leon/reactor
Map Start Reactor RNG - RUS-T / Fission / SuperMatter
2021-03-26 19:51:43 -05:00
Anthony Rodriguez
e4f94c38e2 PrepWork for Tether (#2878)
Co-authored-by: Anthony Rodriguez <newman446@hotmail.com>
2021-03-24 13:59:49 -07:00
Anthony Rodriguez
324c34eb44 More details and feedback 2021-03-23 16:58:18 -07:00
Anthony Rodriguez
e226c708e0 Computer added for extra reactor control, and cams 2021-03-23 10:41:03 -07:00
Anthony Rodriguez
02fb945c3b Suggestion Fix for RUS-T 2021-03-23 07:37:45 -07:00
Anthony Rodriguez
4525aaefcb More little changes 2021-03-23 01:10:02 -07:00
Anthony Rodriguez
4f538690f2 updating IDs for RUS-T tools 2021-03-22 21:23:50 -07:00
Anthony Rodriguez
5d5bd36060 Further Annihilation Fixing 2021-03-22 19:15:10 -07:00
Anthony Rodriguez
0e0bbfd621 Prepping 2021-03-22 18:51:51 -07:00
Anthony Rodriguez
46e1c84fbf Map Start Reactor RNG Re-added! 2021-03-22 18:50:05 -07:00
buffyuwu
5587441b6c this should fix odd shadows near the lavaland base (#2872) 2021-03-22 11:59:59 -07:00
nik707
4d9e56227d Merge pull request #2852 from Captain277/Blood-Red-Removal
Removes All Static Blood Red Hardsuit Spawns from POIs
2021-03-15 21:26:15 -05:00
buffyuwu
c73eb3b0af adds some lobby screens (#2864)
also stops using triumph lobby screens in minitest. there will now be minitest specific lobby screens to prevent ANY confusion for a dev as to where they're at.

see: devmins hitting 'start now' on live
2021-03-14 18:20:27 -07:00
Captain277
f8b88972d2 Removes static spawn Blood Red Hardsuits. 2021-03-11 16:50:51 -08:00
silicons
e2632b9d5e alright (#2839) 2021-03-10 12:33:25 -08:00
silicons
472ef33488 nukes some unmanaged global variables (probably merge this fast as it touches a hundred+ files) (#2829)
* replacements

* indents
2021-03-07 19:01:45 -08:00
silicons
5cbcf945a6 fixes 2021-03-04 01:42:43 -07:00
silicons
7303a4cd33 whew 2021-03-02 18:47:50 -07:00
silicons
d3d0db4647 Merge remote-tracking branch 'citrp/master' into init_2-real 2021-03-02 17:21:41 -07:00
silicons
e9acf212fb Merge remote-tracking branch 'citrp/master' into init_2-real 2021-02-25 03:24:11 -07:00
silicons
054cd3b652 holy fuck 2021-02-25 03:19:54 -07:00
silicons
abcdebbf4f all 2021-02-25 03:18:52 -07:00
silicons
ac7cb45b28 fixes 2021-02-25 02:29:52 -07:00
Hollow-SS13
dcb0ac5a6f Addings Ruin Part 0.1 2021-02-23 22:06:14 -03:00
silicons
289b9c1feb Merge pull request #2745 from Captain277/Restores-Broken-Lavaland
Apparently the last PR for Lavaland Broke It? Fixes that.
2021-02-22 05:02:49 -07:00
silicons
10369a482c more 2021-02-22 02:50:58 -07:00
silicons
2878c443e0 ok 2021-02-22 02:26:37 -07:00
silicons
857846c8bf Merge remote-tracking branch 'citrp/master' into init_2-real 2021-02-21 22:34:43 -07:00
silicons
8d8ccd3bb7 line endings 2021-02-21 22:18:05 -07:00
silicons
c3de692726 let's do that 2021-02-21 22:17:30 -07:00