Commit Graph

5674 Commits

Author SHA1 Message Date
Marmio64
323dbe4abc space comms lieutenant (#20081) 2023-08-29 13:56:45 -05:00
Addust
501713ba76 Syndicate Icemoon (#19473)
* and so, it begins!

* q

* wergqw

* Update icemoon_surface_syndicate.dmm

* FUCK MDB!!

* due to MDB we cannot have the cameras, so the shed is now binoculars room

* rtj5weje

* 4e5rhw45h4wr

* get employed

* the great role update! with new jobs and shit! it works better!

* fuck

* rth4whwerg

* trherh

* rgwergw

* eryu5weu

* gherthrsthd

* noise

* We're outta draft, bois.

* stop FAILING MY TESTS you fucking NERD

* gbfgifyutvtiguyfuyfhvyffiytfyug

* aaaaaaaaaaaaaaa

* fuck your test failures, FISH!!!

* hallwayening part 2

* captain's toolbox hurr durr

* erghwrtjkrtyhjrdtjnftghhertsg5ertyuh

* yhujtydj

* fuk

* tydkyufgkhj

* rthr

* fvtyuiktyufk

* fg976tg897t8967t7868y9iku6807y097y-97y97

* robo thing

* a

* a

* 90=[]90uj'io';iho;

* A

* yhuioyg7i6tf678y789y689

* tfctygjfcyuf

* you can just move a single thing thats actually fucking revolutionary holy shit nice work strongdmm

* i hate test failures and this aint gonna fix SHIT but here have some dried blood

* test to see if xenobio caused the test failure, stand by

* okay, what about no cameras?

* Well fuck me.

* eh

* h

g

* oh god yes

* huehueuhe

* guh

* ok nerd

* catches it
2023-08-27 00:13:52 +02:00
Byemoh
35354a5098 [BOX] flips det office (#20008)
flips det office
2023-08-25 13:19:29 -07:00
Bop
c683c542ac Radiation Anomaly: Revengeance (#20031)
* yes

* yes admin

* yeah

* guh

* yes

* opsz

* yesa

* yes

* loop

* Update rad_goat.dm
2023-08-23 15:03:49 -05:00
Maxim
80f7b92d98 Adds a new emergency shuttle: The Crowd-Source Shuttle (#20030)
* kermit

* Revert "kermit"

This reverts commit c44c865773.

* Adds shuttle

* Removes yogstation changes

* Test

* e

* eee

* etasdwasdwa

* awdasdwasd

* hmm

* i forgot

* Update shuttles.dm

* Update shuttles.dm

* Changes button IDs
2023-08-22 16:09:31 -04:00
Cark
5c90e26008 fixes a broken pipe in the backroom of botany (#20080) 2023-08-22 08:05:48 -05:00
wonderinghost
03eca7158c Adds a fax machine to IceMeta LawOffice. (minor edits) (#20054)
* LAW_OFFICE

* re'adds missing shutter button

* removes random ass table
2023-08-20 07:23:20 -04:00
N3D6
8719f6c9fa missed a few (#20038) 2023-08-19 09:08:26 -04:00
N3D6
2adec0d393 [MDB IGNORE] IceMeta (#18054)
* Starts placing ice and snow at evac, makes shuttle dock

* IceMeta dm and json file

* A lot more ice and snow

* two files/?????

* maybe halfway done placing ice if even lol

* more ice. almost done with this LONG ASS PROCESS

* engines, maybe? this will take some testing

* a lotta lotta ice (HOLY SHIT I ALMOST CLOSED MY BROWSER WITHOUT COMMITTING THIS)

* Finishes placing ice and adds genturf around the map

* oops!

* couple little bugaroonies

* some stuff i missed

* some more stuff, mining base is done, added snow to some space i missed things

* stuff

* oops

* Config

* new landmarks

* ioopssie poopsie!!!!!!!!!!!

* forgor

* fmaily guy

* forgot like one or twenty tiles of ice

* Rename the map

* fix that a little

* why was this not here exactly?

* ATV room

* podbay door

* finishes up

* disables meta

* coats, boots and a pickaxe

* i caught you on camera acting sus

* removes bloat bandaid fix

* replaces bloat with not bloat

* finishes fixing that stuff

* oops

* space tile

* Quality issues and makes a cool snow path around the stayshun

* airless turf no bueno

* expand escape shuttle dock

* update meta

* fuck you *steals atmos*

* ye

* plz work uwu

* snow tiles on engine

* jortz

* makes tesla template look much better

* cleans up the outside of the station more

* sussy

* icemoon 2 z levels now

* Revert "icemoon 2 z levels now"

This reverts commit 9a6aaeea2e.

* plz work this time

* fixes json

* why isn't it working

* ned you're fucking retarded

* god fucking damnit ned

* poop

* Revert "poop"

This reverts commit 62cecf79eb.

* ok this time it should work

* one more thing

* fortnite

* rip spacemeta.... you did well

* ned are you fucking dumb?

* what the flip

* a zillion errors

* what the hell was the point of this?

* oops

* axes bloat icemoon maps

* forgot to delete this one lol

* adds joe the goliath to the mining base. super important change

* maybe fixes that? probably not

* fixes 2 runtimes

* fixes another runtime

* fix window

* b

* l

* fixes lavaland spawning

* random maint ruins with space in them suck anyway

* dogshit ass ruins

* fuck you maint ruins

* dilithium spawns now

* fixes KAs again and makes legion damage ignore apply to mining levels again

* b

* left some space

* prolly fixes solars

* Revert "Merge remote-tracking branch 'upstream/master' into icemeta"

This reverts commit 82e3ad1c73, reversing
changes made to 9d918cf020.

* Revert "Merge branch 'icemeta' of https://github.com/N3D6/YogstationIfItWasntMid into icemeta"

This reverts commit 9d918cf020, reversing
changes made to f06088b78b.

* Revert "Merge remote-tracking branch 'upstream/master' into icemeta"

This reverts commit f06088b78b, reversing
changes made to c217b19fcc.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into icemeta""

This reverts commit e4e618015c.

* Revert "Revert "Merge branch 'icemeta' of https://github.com/N3D6/YogstationIfItWasntMid into icemeta""

This reverts commit 6982c478e5.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into icemeta""

This reverts commit 5ea59d7339.

* security interace

* walls instead of windows for the space loop pipes so it's less cancerous in the long run

* Expands mining station atmos a little, shifts some stuff around the mining base in general, adds a heater so the base no longer gets mad chilly

* forgot a decal

* didn't commit it

* y

* ned

* i love this so much!

* brig :)

* L bozo

* THE DECALENING PART TWO: SCIENCE (#2)

* remove tiles

* forgot some red tiles

* farts

* done

* THE GREAT DECALENING PART 3: EVERYTHING ELSE (#3)

* should kill most tile decals

* should finish murdering old ones

* hey buddy you dropped this

* probably finishes killing old ones

* should properly shorten the ones that were done wrong

* maybe shrinks it now

* something went very wrong but i think we are back

* okay is this it

* silly ned

* what the flip

* balderdash

* Revert "balderdash"

This reverts commit 969dc70157342f60ac933f07e2d42eccd14f23e9.

* does like WAY too much stuff to describe

* ALMOST DONE

* ned you suck lol

* L ned + Ratio

* CONCLUDES THE GREAT DECAL-ENING

* few little tweaks

* HoP turnstile, as god intended

* remove free laser gun

* Fix Nukies P1: The Shuddle can drop (someone fix the flattening problems plz)

* Fix Nukies P2: Add plasma cutters and some plasma to the nukie shuttle

* gene wallmed 4 consistency

* fuck update appearance

* make bridge trims a ltitle better

* fuck this shit bro jesus

* i think i forgot this somehow idk

* fuck

* smart feller? no. fart smeller.

* makes engi and atmos way better looking trim-wise

* wait what if that's not actually true at all??

* plz work that'd be cool if it did

* i think this is right

* dumbass ned

* this might work idk

* plz

* Revert "plz"

This reverts commit c13270eb87.

* Revert "this might work idk"

This reverts commit 495db72813.

* Revert "dumbass ned"

This reverts commit cd59b84b9a.

* Revert "i think this is right"

This reverts commit 63a858aedd.

* Revert "plz work that'd be cool if it did"

This reverts commit b332d0f237.

* part 1

* ned is dumb

* part 2

* let me push this probably

* insignificant change to see if it fixes anything

* sick

* i deadass forgot to commit bro

* Revert "i deadass forgot to commit bro"

This reverts commit 986fa06991.

* Revert "Revert "i deadass forgot to commit bro""

This reverts commit 6d7bed5380.

* i hate this game

* n

* h

* h

* L

* cocaine

* that's important

* when you're here, you're family

* you suck eg ned

* starts working on this a little bit

* labor camp pt 1

* part 2

* sick

* it's done

* oops

* docking port

* kill the old one

* probably fixes pods

* finishing touches

* actual finishing touches

* touches up on a few poopy trims

* de-shittify tool storage

* why was this like that

* Aux base works now

* camra

* fixes everything

* a

* scrungularky

* gta 5

* lets see what this breaks

* unbreak the entire map

* does some stuff

* cool

* i think we are in the clear

* stuff, finishes stuff

* cool

---------

Co-authored-by: Byemoh <baiomurang@gmail.com>
2023-08-14 18:02:55 -05:00
Byemoh
ed9234d845 [box] makes engineering door the right access (#20020) 2023-08-11 02:46:35 -05:00
Byemoh
2ecfcfa274 [BOX] Redoes Engineering Foyer, switches Engine Entrance and CE room, puts another door between the protolathe (GREYTIDFERS GO HOME) (#19769)
* eeee

* e

* Revert "e"

This reverts commit 1e54d72a86.

* fix

* BELL AND HELL

* what

* dafq

* ok

* GO AWAY

* Update YogStation.dmm

* Update YogStation.dmm

* fixes
2023-08-08 18:17:48 -05:00
Byemoh
2e055466f1 red vented (#19984) 2023-08-06 16:09:06 -05:00
N3D6
e63fa95723 kill it. (#19905) 2023-08-02 22:58:31 -05:00
Maxim
7dd7936ee8 [BOX] Fixes mail routing for the detective office and new chapel varient (#19967)
* kermit

* Revert "kermit"

This reverts commit c44c865773.

* doing your mom
2023-08-02 22:57:45 -05:00
N3D6
b5ecfa3d56 yeah (#19976) 2023-08-02 22:57:05 -05:00
Cark
443dafbc4a AAAAA (#19957) 2023-08-02 21:38:07 -04:00
Cark
ed21b18593 BIOME!!!! (#19909) 2023-08-02 21:37:41 -04:00
Byemoh
341c46b243 [ASTEROID] Redesigns Perma (#19646)
* ass

* fix cornflakes

* Update AsteroidStation.dmm

* Update AsteroidStation.dmm

* revert

* eee

* i hate ezhan
2023-08-02 17:37:22 -04:00
N3D6
b9b27ec2b6 [MDB Ignore] Asteroid trims overhaul without random stupid conflicts (#19849)
* still don't know why that shit was conflicting :)

* eh

* redoes engi and atmos, coming together nicely

* almost forgot to commit again

* fix

* does that other stuff
2023-07-27 15:08:52 -05:00
Cark
1aba434c30 FUCKING WHY (#19850) 2023-07-25 20:48:42 -05:00
Byemoh
d535d1c345 readds disposal (#19856) 2023-07-25 20:47:54 -05:00
John Willard
040129b303 Two-handed component (#19365)
* Adds twohanded and ports some things to use it

this will require update_appearance to properly compile.
Haven't ran updatepaths yet, I'm just saving my progress.

* Saving my progress again.

* Nearly finished

* Fixes

* test commit

* Revert "test commit"

This reverts commit 6e4e79a57a.

* existing base_icon_state

* base to atom

* Update twohanded.dm

* map updates and updatepaths relocation

* merge conflicts

* Fixes in local testing

* call parent

* fuck you admins have to wait procs out

* wielded stats
2023-07-23 22:49:39 -05:00
Byemoh
28b7d3d96c [box] makes outside of lawyers office a little less goofy and splits lawyer's office (#19776)
* rrrr

* ttttt

* Update YogStation.dmm
2023-07-23 02:21:45 -04:00
Time_URSS
edbd377a7c Adds a new syndicate space ruin + new spawners (#18498)
* Adds the station as a whole, coded new areas

* Forgot to save the file

* Updated station with areas

* Updated map with essentials

* Fixed solar arrays starting unpowered

* Finished station layout, fixed some bugs

* Added the spawners code, fixed some station bugs.

* Fixed sleeper not rendering icon properly

* Addons to the map, added the spawners in.

* Made the station an actual derelict now

* Made the station an actual derelict x2

* Added lore notes to guide the spawners.

* paper

* Lore papers added to the ruin (at last)

* Made the station more derelict, added hostile mobs

* More immersion details added

* Removed soldiers, added few pirates and a gun

* More pirates, less mats, restructured map

* Converted map to TGM (second attempt)

* Fixed pistol mag incompatibility, added 1 solar assembly

Fixed the incompatibility of pistol mags, now the mag should be able to be used with the gun. Added 1 more solar assembly to match the slots for solars.

* Added protolathe and printer boards

Added the missing protolathe and circuit imprinter boards.

* Scattered plastitanium has more sheets

Added more sheets to the scattered plastitanium and plastitanium glass.

* Added extra mag, added esword crate

Added another mag for the pistol (for the weaklings). Added a secure crate with 2 eswords in the virology lab.

* Minor fixes - Hydroponics APC fixed (hopefully)

Changed a few area placements, fixed (hopefully) the hydroponics APC position.

* Added more ores (and missing ones)

The ore crate spawned lacking some ores such as uranium and dilithium, now the crate spawns with those. Added more bluespace as well.

* Added disposal system

Disposal system tubes added to the ruin. They're unfinished, same as the atmos pipes. Added missing disposal bins to some rooms.

* big red text update

Updates the red text to specify that if you touch the main station or abandon the derelict to fuck off somewhere else (without intention to return) you shall no longer be welcome to my ruin.
2023-07-22 23:10:16 -05:00
Cark
776aef7932 [BOX] Fixes errors with det office: Biome doesnt open a PR directly conflicting with mine edition (#19777)
* FUCKING BIOOOOME

* FUCKING BIOOOOME
2023-07-22 23:05:37 -05:00
John Willard
9a89bb674f Adds update_appearance (this is friggin big news) (#19643)
* update icon and update appearance

* update name

* fixes

* Removes double parent calls from many things

* More fixes

* minor fixes

* fuck

* A!

* general annoyances in this PR

* going in specific fixes

* remove remaining update icons and hud fixes

* Mass replace update icon with update icon state/overlays

* compile

* push my work so far

* goes back on things I broke

* a

* goes through like 80 more cases

* going through more update icons

* compile again

* thank you tattax

* Goes through the remaining update icon

* fix CI cries

* Fixes cigs, canisters and guncases

* Fixes airlock unres sides

* Fixes the flash

* Fixes cryo cells

* gun fix

* Egun fixes

* fixes mini eguns

* Update energy.dm

* Fixes MMIs

* Fixes security level interface

* Fixes cigar cases

* Bow & Critter crate fixes

* Fixes signalers

* Fix canisters again

* re-adds blinking red

* Fixes solar panels

* Fixes cryogenics (and forced standing)

* Update cryo.dm

* sechailer fix

* Maybe fixes pitch black roundstart APCs

* Update apc.dm

* yet another egun fix

* Fixes plasmamen helmets among other stuff

* Fixes canisters for good

* Fixes booze dispensers

* Fixes new icon updates people added

* Probably fixes ballistic guns

* i give up lol
2023-07-21 18:49:04 -05:00
Cark
2f6dffb451 fixed toilets (#19756) 2023-07-21 16:23:01 -05:00
Cark
e45ca4f812 [BOX] Completely overhauls detective's office, and moves it to the other side of EVA. (#19651)
* layout

* lawofficemove

* finishedlawoffice

* CARTRIDGESSSS!

* pipesforthedet

* finishing touches

* kills wire to nowhere

* fixes a wire

* fixes more wires x3

* changes law office because people complained

* take a drink everytime cark forgets firelocks

* requestedchangs

* hazardstripes
2023-07-21 16:12:30 -05:00
airlines7
70c40ba832 3 new and cool escape shuttles (#19430)
The drone mafia is now a thing and added it to one of the 3 new emergency shuttles.
2023-07-21 21:07:39 +00:00
Cark
4aece23ce7 BEEEEEEEEEEEEEEEES!!!!!!!!!!!!!!!!!!!!! (#19716) 2023-07-21 16:02:45 -05:00
Cark
0fb644e762 manateewtf (#19718) 2023-07-20 17:19:01 -05:00
Ezhan
92916b6c5c gives meta a gene wallmed becuase i died without it one round (#19705) 2023-07-17 20:15:06 -05:00
Cark
9c5d243b7d mappers!!!!!!!!!! (#19687) 2023-07-16 13:01:45 -05:00
Cark
bb4b19d637 im dumb (#19688) 2023-07-16 13:01:36 -05:00
Cark
75bd95c4b1 [BOX] Brings back the fabled "Dorm 1" as it died after we added cryosleep, fixes a mapping error in perma. (#19667)
* dorm 1 returns

* id tags
2023-07-15 15:37:53 -05:00
N3D6
3f4034455a ok they don't wander now (#19660) 2023-07-15 11:56:19 -05:00
Bop
cf3bd94805 You can now change the freezer/heater mode on the thermomachine interface (#19574)
* unga

* du

* fix balloon

* fix icon

* fix name
2023-07-12 15:21:28 -05:00
Cark
e6508d600f kek (#19634) 2023-07-12 15:20:52 -05:00
SapphicOverload
96c9b3eda1 Sniper rifle is now bolt-action (#19588)
* real

* fuck it i'm putting this in another pr

* okay maybe not just a worse DMR
2023-07-12 15:01:54 -05:00
Cark
ba643c3a38 [BOX] Makes some changes to new perma to appease a few requests. (#19612)
* permabrig changes

* woops i forgot to do this

* fixes lack of firelocks in 2nd entrance

* buffs kitchen because i forgot

* forgot one fridge type

* AAAAAAAAAAA

* ok im done for real now

* recharger

* stg i keep thinking of shit

* removes erp

* catwalks n stuff
2023-07-12 14:57:38 -05:00
Aquizit
56502a8558 Reinforces Reebe so Clockies cannot escape (#19599)
* servant-blocker fixes

* fixing some things

* found the original issue and PROPERLY fixed it now

* fixed ONE TILE that had double grilles
2023-07-12 14:45:00 -05:00
Byemoh
7ca5171df9 Update asteroidstation.json (#19527) 2023-07-10 21:21:40 -04:00
Addust
c28046151c fixes an atmos bug in Syndicate Lavaland (oops!) (#19613)
* fixes an atmos bug in Syndicate Lavaland (oops!)

* less booms

* ACTUALLY fixes it

* cyka blyat
2023-07-10 13:27:08 -05:00
Aquizit
4e6f3a2797 unsecures psych offices (#19503) 2023-07-08 12:36:50 -05:00
Cark
28dff2c2cf woopsie (#19561) 2023-07-08 12:00:57 -05:00
Byemoh
bead2070e7 [box] nw maints wire for auxbase (#19516)
* e

* move this
2023-07-08 11:55:48 -05:00
athena413
4864739b32 shutterer (#19515) 2023-07-08 11:51:15 -05:00
azzzertyy
83286595f8 clerk can now access service protolathe on all maps (#19494)
* clerk

* test

* mayb

* adgfssgadfgdf
2023-07-08 11:47:18 -05:00
airlines7
13a6e01dcc change door (#19546) 2023-07-08 00:36:19 -05:00
airlines7
69dad48925 Ruin Asteroid Medbay, now with a lamp on the table! (#19339)
* New and funny layout

* Flips stasis and sleeper

stasis was originally by the glass now its where the sleeper is.

* Readds Medbay Central APC

forgor

* Convert map to LF

it defaulted to CRLF :(

* decals and rearrangement

* viro decals

* whoops genetics has their consoles back

* Peoples choice awards

* Update AsteroidStation.dmm

* thank you github for that.

* Update AsteroidStation.dmm

* Pardon me king

didn't move the paper tray 5 pixels up

* Update AsteroidStation.dmm

* Update AsteroidStation.dmm

* Update AsteroidStation.dmm

* one last upload

* turn the decals thicc

* back to LF

* fixes

* missed a spot

* Update AsteroidStation.dmm

* Update AsteroidStation.dmm

* turf update

* rwall removal

* Un reinforces your walls

request by Azquit to remove reinforced tinted windows in the psyche office

* remove stray wire

* I HATE CRLF I HATE CRLF I HATE CRLF

* lizard

* hate lines

* azquit appeasement

* accursed decal haunting the halls removed

* Aquarzit braking mah stuff

* sad emoji
2023-07-02 22:55:16 -05:00