Commit Graph

960 Commits

Author SHA1 Message Date
Captain277
65f4c1c090 I hate how these turfs were defined. Final pass I hope. 2022-03-08 02:00:44 -08:00
Captain277
e224e111b2 Edge Blending Catwalk Adjustments 2022-03-08 00:24:51 -08:00
Captain277
77f628f41b Lavaland Edges and Weather Fix 2022-03-07 21:38:25 -08:00
Captain277
766e6b2df1 Merge branch 'master' into Lavaland-Expansion 2022-03-07 17:05:22 -08:00
CharlesWedge
0019de3a3e Actual Planetary Dynamic Lighting (#3770)
* 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 triumph_defines.dm

* In Theory this should load things

* Now it will work

* Dynamic Lighting Update

Planets now also use their dynamic lighting since they have functioning Day/Night Cycles Now

* Actual Dynamic Lighting

* Hoping and Praying This Actually Fixes Things

* Hopefully this will function

* Update vorestation.dme

* A Shot in the Dark that could work?

* Last Chance

If this does not cause Dynamic Lighting to happen I am offically out of ideas

* missed one
2022-03-07 17:03:18 -08:00
Captain277
62e2d348d1 The Colony Was Preserved 2022-03-06 20:29:21 -08:00
Captain277
bfb8d74d32 Final Pass, Ready to Run 2022-03-05 01:52:03 -08:00
Captain277
8f3f55273b Machinery and Finalization Part One 2022-03-03 17:39:13 -08:00
Captain277
0662cfe301 Merge branch 'master' into Lavaland-Expansion 2022-03-02 20:20:16 -08:00
CharlesWedge
7dbb055c0b Fixes Weather, Enables Dynamic Lighting (#3766)
* 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 triumph_defines.dm

* In Theory this should load things

* Now it will work

* Dynamic Lighting Update

Planets now also use their dynamic lighting since they have functioning Day/Night Cycles Now
2022-03-02 19:26:13 -08:00
crystal
213d1b1fbf Update triumph_defines.dm (#3763)
fixed the announcement

Co-authored-by: Harry Foster <Harry.Foster@mytwyn.com>
2022-03-01 18:47:40 -08:00
Captain277
32cb48ee03 Merge branch 'master' into Lavaland-Expansion 2022-02-26 19:10:34 -08:00
Harry Foster
d59dbedb83 Update triumph_defines.dm
updated the transfer stuff
2022-02-26 23:09:23 +02:00
Zandario
baf538d5ea Death to modular_citadel (#3751)
* -obj and machinery overides

* Devices

* Material

* item code gone lets goo

* item code gone lets goo

* game folder done

* admin and clothing

* detectivework, donatorreskins, events, games, mob, nifsoft, paperwork, projectiles, research, resleeving

* CODE FOLDER DONE

* maps

* All sounds and non-conflicting sprites

* obj sprites merged

* Some mismatched sprites but DONE

* The beast is finally killed.

* Fucking mapped overrides

* Ugh CI dum but gud
2022-02-25 19:11:09 -08:00
Captain277
e96ace13d2 Map pre mobs 2022-02-24 21:52:25 -08:00
Captain277
388a0e5b44 Update before I go. 2022-02-24 08:22:04 -08:00
Captain277
b0023842c1 Push changes. 2022-02-24 07:39:01 -08:00
Captain277
75ea37a695 WIP LL 2022-02-24 07:11:53 -08:00
Zandario
76b1cdbcda Merge pull request #3741 from Citadel-Station-13/Shuttle-Rework-and-Armament
Fleet Assignment Approved - Courser Scouting Vessel
2022-02-23 20:05:40 -06:00
KT
5d31d8a66f Talon's sudden removal (#3745) 2022-02-22 00:32:23 -08:00
Captain277
a713128eed For they sow the wind, and they shall reap the whirlwind. 2022-02-22 00:31:48 -08:00
Captain277
7df728c355 Merge branch 'master' into Shuttle-Rework-and-Armament 2022-02-18 10:43:48 -08:00
KT
e2435b7408 Nebulous Gas PR 2 Electric Bogaloo (#3735)
* Please dont break please

* How did I forget this

* Fixed hole in janitor's room, added corpo crates to warehouse

* Added Cryopod computers

* A few small touches here and there
2022-02-18 10:42:11 -08:00
Captain277
bbb5635b76 Adds the Courser Shuttel 2022-02-18 03:56:25 -08:00
KT
5f23e2d2b9 Wire fixes, removes 1% hooligan crab spawners from maint, nerfs station maint drone (#3666)
* rage and regrets

* rage and regrets

* oh

* uhh

* thank you so much ktoma36!

* and that

* sigh

* fix

* man

* that

* should probably do that too

* that too!

* stairs

* fine

* Touched up on almost all the external airlocks

Mining and security ones not touched with this one

* Found a few I missed

* Touching up maints, fixed couches in bar

* Touched up on maint, added construction solars, fixed engine SMES

* Brain is dumb and tired, fixed a few things I messed up

* Gave airlock buttons commands, synced frequencies, and fixed the sofas

* Standardizing a few object paths tether_things.dm was hogging

* Stupid holodeck controller is causing conflicts and its not even functional

* Am dumb, removing some map assets I left lying around

* God why

Touching Talon stuff and trying to get docking controllers to stop throwing runtimes

* Talon is now functional, fun

* Lets see if this fixes the dam map compile issue

* Fix for docking ports (Hopefully)

* Hotfix for testmerge, supply shuttle runtime fix

* Fixes lateload issues and some slight map edits

* Many fixes and some new things added

* Woops, this is for later

* Have to get rid of the shuttle_definition on a landmark here for now

* A little more bad variable removal (god multidockers are wacked)

* Some decal touchups for triumph, generalizing tether's turf generation, generalizing a few network defines,

* Forgot to tick a file. Also found a function to hopefully make these shuttles work properly

* Consolidates Red Alert Airlock, misc holodecks, and more camera networks

* Consolidated most everything in tether_things.dm and triumph_things.dm ,

* Forgot tick another file, add placeholders for station telecoms that arent loaded in

* Removes hooligan spawns from maint, fixes wires, nerfs station maint drones

* Fixes thrusters, xenobotany doors, and toxins mixing lab

Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2022-01-15 04:58:26 -08:00
FreeStylaLT
2aba81a841 Various minor Cargo tweaks + removal of secondary explo / cargo staircase (#3597)
* sorry keek had a few other tweaks to make

* area fixes, external button fixes

* fixes and tweaks to dock store

* removes lazy edit, decals

* this one too

* bugs of varying APC variety

* quotation marks more like AAAAAA

* fixes cargo office power alarm

* woops the APC

* minor tweaks, a lot of fixes and a cable / pipe pass
2021-12-11 19:10:53 -08:00
TheKnightofAura
3b8aaff210 Moves docking arm to D2 below cargo+ useful customs and shop (#3598)
* Moves docking arm to D2 below cargo, installs customs office and Visitor rooms there

A large shop area, the docking arm, a vistor room. Most importantly, all somewhat secure. It's now possible for security to watch a single chokepoint that people coming to the docking arm can access without hacking. There's still a side-door to encourage sneaking gameplay if traders wish to break in without taking out a wall, but overall, more secure. At the very least, customs is now more between the docking arm and the rest of the station, instead of on the far side of the docking arm. Note: old customs is still in place, as it has a shuttle attached I don't feel like needs to be moved. Old laundry is gone, but haven't decided what to do with old visit office.

DNM

Currently non-functional for reasons I don't understand. The station's shuttles won't take the new docking arm's docks as valid landing points, and I don't understand why. Mostly making this for map merge conflict resolution.

* Fixes: Docking arm waypoints not working, strange hole to space, some pipes.

* Removes explo's staircase, refubishes visitor room, moves cargo substation, adds last two visitor dorms, de-walmarts the clothes vendors

* Fixes _the hole_ Can't resolve light issue, or airlock cycling

* replaces misplaced spacing with proper spacing

* Fixes (hopefully) integration errors, as well as non-functional airlock, by cannibalizing and sacrificing two others.

* Fixes a broken pipe that I removed to make it not run under a wall, and never re-connected
2021-12-04 01:35:50 -08:00
silicons
1887a0fb39 Merge pull request #3589 from ktoma36/ClassD-Reimplimentation
Class D Planet Reimplementation (Now Virgo 5!)
2021-11-24 18:16:02 -08:00
KT
4f059b0073 Third times the charm :D 2021-11-11 02:00:23 -05:00
KT
507557df16 Fixes Trailing newlines and hopefully the bunkerD issue 2021-11-11 01:38:21 -05:00
KT
90aa953910 Class D (Virgo 5) Revive 2021-11-11 00:09:54 -05:00
Captain277
c3c2907aee Turfs. (#3579)
cum
2021-11-09 14:56:23 -05:00
silicons
4512e9ea2a the server now announces which engine is loaded. (#3571)
* Update _mapping.dm

* Update engine.dm

* Update _engine_submaps.dm
2021-10-28 13:39:28 -07:00
Knouli
120f455b49 Talon Captain gear name fixes (By Anodyne) Re-Do (#3507)
* straight file copy from Anodyne

* near straight copy from file from Anodyne

* HAHA WHOOPS LET'S UNDO THAT RIGHT FAST
2021-10-13 22:45:46 -07:00
silicons
aa5541d33b removes copyrighted nintendo music (#3430)
* Update Off Station Areas.dm

* Delete Sacred_Grove.ogg

* Update tether_areas.dm
2021-09-30 02:50:26 -07:00
Captain277
108a7ef525 Merge branch 'master' into Overmap-Ports 2021-09-19 18:06:19 -07:00
silicons
d27639cc99 kek (#3384) 2021-09-17 21:07:32 -07:00
Captain277
105e8306bc Merge branch 'master' into Overmap-Ports 2021-09-15 23:17:47 -07:00
silicons
4eda4157d8 Merge pull request #3366 from Citadel-Station-13/Nukes-Lobby-Screens
Removes V.O.R.E. Lobby Screens From Our Rotation
2021-09-15 23:09:09 -07:00
silicons
4dd65ffdfc Update maps.dm (#3375) 2021-09-15 21:14:30 -07:00
Captain277
4ee146cd37 Ha ha, I have no idea what I'm doing. 2021-09-12 11:39:24 -07:00
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