Commit Graph

301 Commits

Author SHA1 Message Date
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
silicons
576feb348e TESTMERGE THIS FIRST - overhauls how air blocking works (#4070)
* oh boy

* reverse dir

* trainwreckies

* trainwreckies

* trainwreckies

* wups

* Damn!

* Damn!

* fixes wtf

* wack

* fixes

* FUCK OFF

* uh.

* uh okay
2022-05-16 21:44:07 -07:00
silicons
e6b7bf5d23 fixes (#4071) 2022-05-16 12:10:51 -07:00
Zandario
cc701aedb6 [Ready?]Machine Code Cleaning and some other stuff. (#4050)
* AutoDoc, bye useless comments, and some flair

* WHEW

* blele

* GLOB.machines

* Funny game

* Forgor

* Appease the linter

* asdasd

* chairs

* asdsad

* asdfasdf

* wuh if

* bruh
2022-05-15 14:41:34 -07:00
silicons
0509907033 mining turfs 2022-05-14 07:25:46 -07:00
silicons
5a496c5dff Baseturfs (#3938)
* ill do this in the coffee shop later

* has to go

* add stuff

* changes

* this is going to explode

* this is going to explode x2

* more

* *scream

* move

* w

* oh god oh fuck now for main proc

* progress

* wack

* next segment..

* update

* shuttles are next

* AAA

* sigh

* this is going to be ugly

* ugh

* epic!

* pain

* hope this works

* patch

* patch

* patch

* patch

* patch

* epic!

* wack

* oh god..

* oh god..

* wack

Co-authored-by: fake_vm_user <fake_vm_user>
2022-05-06 20:13:51 -07:00
silicons
ee471ebfb5 Spawnpoints (#3976)
* marker

* port main files, start refactor

* *scream

* oh dear talon/trader will be painful to do

* wooo

* I HATE OLD CODERS

* t

* regex pass 1

* regex

* More

* woo

* woo

* random option

* fixes

* oh man there's a lot of work to be done

* ugh

* that goes to

* finish purging some things with fire

* those

* those

* those

* those

* reminder

* cancer

* do that

* hm

* hm

* hm

* wack

* hm

* hm

* hm

* hm

* wacky

* oop

* oop

* aa

* fixes

* t

* um

* wacky!

* epic!

* sigh

* Update landmarks.dm

Co-authored-by: fake_vm_user <fake_vm_user>
2022-05-05 20:20:38 -07:00
fake_vm_user
f04a7d5336 landmark repath 2022-05-01 18:00:16 -07:00
Zandario
db39fde779 Butchering, Macro standardization, and generic tidying (#3936)
* Beginning

* Moar

* Blelelelele

* Robo Organs *Flooshed*

* Went overboard and organized a shit ton of tags...

* Partially implements VOREStation#9287

* Performance fixes from Polaris#7759

* More Code Cleaning

* Recompiled TGUI Bundle
2022-04-26 13:21:19 -07:00
silicons
71889b4f65 rendering update (#3695)
* rnedering update

* fixes

* wack

* wack

* placeholder

* sigh

* sigh

Co-authored-by: fake_vm_user <fake_vm_user>
2022-04-23 21:12:54 -07:00
Shadow
e591e559c6 fix misspelled name in crew transfer (#3904) 2022-04-19 12:44:45 -07:00
Zandario
7606a27b04 100K Mass to 25K Mass 2022-04-07 01:56:30 -05:00
Captain277
f98527715a Planet Standardization Finale 2022-03-15 20:46:13 -07:00
Captain277
b7a3a4d81c Dynamic Lighting Finally Fixed 2022-03-15 08:55:35 -07:00
Captain277
a2fa070bc7 Class H and Class D repairs. 2022-03-15 03:54:37 -07:00
Captain277
072166b02c Cold For Real 2022-03-14 19:42:09 -07:00
Captain277
78a65781cf Frozen Overhaul 2022-03-13 23:09:54 -07:00
Captain277
c37e0bb23e Buffs Clear Sky Time on Lavaland 2022-03-10 13:02:10 -08:00
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
KT
90aa953910 Class D (Virgo 5) Revive 2021-11-11 00:09:54 -05:00
silicons
d27639cc99 kek (#3384) 2021-09-17 21:07:32 -07: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
1b8857be07 runtimes 2021-05-28 06:58:25 -07:00
silicons
e59d4272cc shoo 2021-05-28 04:43:56 -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
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