Commit Graph

5674 Commits

Author SHA1 Message Date
Addust
4ea745a04f you idiots (#20743) 2023-10-28 23:24:18 -05:00
Byemoh
e5cee0fe5c [ASTEROID] moves evac up, removes petting zoo (#20599)
* sad

* reuqested changes

* shortens

* requested changes
2023-10-28 10:24:23 -07:00
cowbot92
d59e555963 ok (#20728)
brazil ho
2023-10-27 18:07:11 -04:00
Cark
179d2caa06 there (#20745) 2023-10-26 20:26:21 -05:00
Byemoh
b615356323 awawaw (#20738) 2023-10-25 02:41:12 -05:00
Addust
68b74019c8 And that, gentlemen, is why I do not design my own nuclear reactors. (#20720)
* fuck

* guh

* lets fucking goo
2023-10-24 14:26:46 -05:00
Aquizit
e16bbe6e4b lawyer access (#20705) 2023-10-23 20:59:38 -05:00
Byemoh
3075758c8d [PORT] New Jraphics (#20492)
* new floors

* fix centcom

* bulb lighting

* better plating

* lighting overlays

* grime me up scotty

* Update YogStation.dmm

* fix box more

* icemeta

* asteroid

* Update miningbase.dmm

* Update YogStation.dmm

* Update lighting.dm

* Revert "Update miningbase.dmm"

This reverts commit a090b01c1d.

* more floors

* Revert "asteroid"

This reverts commit 1568d14dbb.

* Revert "icemeta"

This reverts commit e40d220e2c.

* reset yogs

* Revert "fix centcom"

This reverts commit 9598cfd107.

* fix floors

* Update CentCom.dmm

* Update AsteroidStation.dmm

* grime

* Update floors.dmi

* RUST WAAA

* cornflakes
2023-10-22 19:34:39 -05:00
Redmoogle
17ac5f8437 Adds a maint ruin with the experimental tools (#20551)
* Secure loot or something idk

* get rid of random loot just replaces it with a safe
2023-10-22 18:20:40 -05:00
Addust
9104d8bb0e Charlie Station now has an AGCNR, may God be with you all (#20668)
* lets fucking goo

* hehe

* nerd

* ok nerd
2023-10-22 09:25:21 -05:00
ktlwjec
ea39a4ca4b fixes vendor (#20702) 2023-10-21 23:06:51 -05:00
Byemoh
bd60d53131 Gambling Hall Clerk Template (#20613)
* gambling is ok

* Update clerk_gamble.dmm

* Update clerk_gamble.dmm

* the spawn + carpet + whatever

* Update ores_coins.dm

* dddd
2023-10-21 20:34:19 -05:00
LoliconSlayer
db7cf35d58 Deputy (#20674)
* Update YogStation.dmm

* Update AsteroidStation.dmm

* Update DonutStation.dmm

* Update GaxStation.dmm
2023-10-21 17:54:03 -05:00
ynot01
5ffa08bf5b UBEY UBEY UBEY (#20640)
* sledgehammer

* oops

* readjust damage numbers

* Update sledgehammer.dm

* slowdown is now only on self

* map changes

* Fix whitespace

This partially reverts commit 014b85e4db.

* Revert "Fix whitespace"

This reverts commit 38f62ec680.

* fix whitespace real

* Update DonutStation.dmm

* icemeta
2023-10-20 08:03:05 -05:00
GraveHat
ad67bb1bdb Adds new Lavaland Ruin: Legionnaire Pit (#20249)
* dungeoncrawler

* stimuluschecked
2023-10-19 15:00:30 -05:00
Addust
cb9fbe6997 the fishing update (#20622) 2023-10-18 11:57:39 -05:00
Addust
345e54db0a The Syndicate Dreadnought - the Nuclear Operative base is now styled to be like a battlecruiser (#20152)
* it begins

* a

* Update CentCom.dmm

* turns the nuclear operative base into a ship (sorta)

* guh!!!

* 48961 - seraph funni wreckage

* b

* e

* 8o7yugh8

* blyat
2023-10-18 11:50:45 -05:00
Chubbygummibear
2489bcf45e Port TG's "Kills obj/item/projectile in favour of obj/projectile" and rename its flag var to armor_flag (#20586)
* seems good

* and the flags
2023-10-14 20:54:01 -05:00
Aquizit
b1123e8b71 [MDB IGNORE] [IceMeta] Icemoon Inn Revamp (#20556)
* INN

* fixes

* stupid 2 tile changes to get mdb to stfu
2023-10-14 07:58:35 -05:00
azzzertyy
ff73a10e90 [SPEEDMERGE plz :3 ] i am stupid and forgot to fix the carpets on clerkmeta (#20612)
* hell

* i didnt like the doors

* mapper misses one trim billions must die

* shutter update

* s

* s

* a

* removes maint door

* ctrl Z

* undeletes river

* undeletes rivers area woopsie

* weird

* part 2

* fADSFDSAFSD
2023-10-13 16:53:02 -05:00
azzzertyy
7dbd5db464 Random variations for clerk on Meta and BoxStation (#20527)
* hell

* i didnt like the doors

* mapper misses one trim billions must die

* shutter update

* s

* s

* a

* removes maint door

* ctrl Z

* undeletes river

* undeletes rivers area woopsie

* weird

* part 2
2023-10-13 16:28:24 -05:00
Byemoh
06851a2f6a [MDB IGNORE] Donutstation: Glazed (#20140)
* moving donut to yogs branch (#20139)

* Adds DonutStation

* donut :)

* wtf

* e

* fix

* Update shuttles.dm

* Update _basemap.dm

* Update maps.txt

* typo

* mapmerge

* I SAID MAPMERGE

* E

* dorms

* break time

* maints start

* Fix atmos

fixes atmos

* add cooling to telecomms

* pixelshift i forgor

* oops

* re-atmos atmos again

* fixes toxins piping

* fixes incinerator i hope

* i didnt save

* cark forgot some cyclelinks

* xenobio had some borked pipes too

* haha oopsie that caused compile failures

* singulo

* woops

* yay

* woops x2

* frfr

* finished up dorms

* gotta move solars GRRR

* BREAKTIME

* removes dumb shit

* i said REMOVES DUMB SHIT

* STG

* transfer centre

* o e o a a

* SW maints

* port quarter finished

* west and northwest maints

* nearly done

* e

* solar areas

* l

* cameras

* cameras!

* time for DECALS

* but actually breaktime

* keel it

* solar panels

* woops

* bridge decals begin

* sec decals

* engi decals

* atmos decals

* i love decals :)

* so many trims

* medical decals

* medical decals!!!!!!!!

* desk bells because i forgor

* sci decals

* door fixes

* fixes messed up sec post trims

* its done...

* maint polish (im bored ok?)

* ok a lil maint inflation as a treat

* ITS BAAACK

* yay!

* pass 1

* dun

* unsquare

* atmos stuff

* dun?

* e

* disposals

* remove templates lol

* area

* fixed

* there

* e

* fixes pods + broken airlock

* floating lighjt

* podbay

* we

* k

* ferry dock

* fixes

* wiire

* fixing disposls

* dun

* cark realizes that he makes dumb choices when hes been mapping for hours at a time and fixes one of them

* charg

* hoh boy that was a catastrophic fuckup to forget thank fuck it came to me in a vision while i sat in my chair thinking about my life choices

* ezhan loves this, i think this looks more cursed but whatever makes my princess happy <3

* on god

* bitch

* b i t c h

* stray rwall

* e o o a a

* security flaws i missed

* carp spawns

* fixes tiime

* fixy fixy

* mmmm fixes

* eeeee

* FIXXXXXXXX

* that was much harder than it shouldve been

* almost done...

* done

* forgor to door

* AAAAAAAAAAAA

* OOPSIE

* OOPS X2

* 2 fixes

* dark!!!

* catwalk

* lights

* fixes a tube

* should fix the other tube

* fixes smes i think

* fucky wucky

* fixes engine?

* cycle

* DOOORS

* fixes

* some more fixes

* e

* woops

* woops

* sec alert terminal

* dorms rework

* lights for cryo

* maybe up to date?

* Update DonutStation.dmm

* Revert "Update DonutStation.dmm"

This reverts commit 9325381647.

---------

Co-authored-by: Cark <44718209+neeshacark@users.noreply.github.com>
Co-authored-by: GenericDM <34109002+GenericDM@users.noreply.github.com>

* bugger

* telecomms hall

* THE phones

* hm

* e

* fix arrivals + no sunglasses

* reinforced walls

* garden and tool storage

* pets

* check again idiote clarke

* moves us back to alpha because biome moved us off it

* moves gravity gen somewhere infinitely more cringe but without redesigning massively, the best option

* areas are important

* very important change

* blahaj is in danger

* flavor

* ocnriiclakes

* 50 now

* fixes a wire and a table

* cuts off sec atmos

* light

* begins medbay overhaul

* medbay 2

* medbay 2

* this is taking longer than i thought it would

* finished

* couple decals i missed

* access

* fixes a typo preventing donut from being voted for

* fixes medbay cameras

* electrolyzer

* service fixes

* gas masks?

* v important

* fix

* mats 4 butch

* moves orm a bit

* a few more of these isnt a bad idea

* fixes a light

* nukes a hidden button

* makes one of the maints less straight

* better

* weh

* rogue catwalk

* catwalk

* slight improvement

* betterer?

* catwalk :)

* there

* mssing pets

* flips these

* access + light

* airlocks here

* axolotls and det shutters

* cargo windows

* -1 axolotl

* woops

* 1

* finished

* kills space library

* fuckup

* minor changes to maint

* bartender no longer gets 2x the gun

* OH GOD THE HORROR

* oh god what am i doing

* god...

* e

* e

* qwedrftghyjmk,l.;/

* update atmos/incinerator

* some firelocks and stuff too

* oopsie that's not supposed to be there

* why does this PR even touch yogstation.dmm?
let's fix that

* mapping erorrs

* showers

* cam

* should be good

* woops

* who did this

* clerk exists now

* there

* fix a single misplaced camera

* E

* e

* con

* how tf did that happen

* fucking cargo

* fax and logic

* sink

* e

* ffs

* WATCH AS I FIX THE COMPILE ERROR BY MOVING A LIGHTSWITCH BEHOLD MY MAPPING PROWESS

* belts bags and huds

* steals from kilo

* changes

* done

* e

* done

* meme big fuckin moron

* e

* flashes +toolbelt

* minor adjustments

* e

* wire

* w

* e

* e

* asterrrr

* mineralz

* asteroid cull

* doors

* firalam,

---------

Co-authored-by: Cark <44718209+neeshacark@users.noreply.github.com>
Co-authored-by: GenericDM <34109002+GenericDM@users.noreply.github.com>
2023-10-13 16:25:34 -05:00
Cark
0982dcbe44 eng (#20541) 2023-10-12 17:33:02 -05:00
Cark
0e3afeb388 gax (#20560) 2023-10-12 17:28:16 -05:00
SapphicOverload
550acb1c70 [READY] AGCNR Attempt 4: Revengeance (#19968)
* WE'RE SO BACK (from #15753)

* reactor (mostly) works but the map breaks??

* makes pluonium instead of nitrium, also map works now

* i forgor

* update_icon()

* fuck it we ball

* background radiation

* Update engine_rbmk.dmm

* rename

* huge refactor, process_atmos() and more

* map fix

* map fix 2: for real this time

* map fix 3: the threequel

* cargo stuff

* exponential K, minor fixes

* simplify

* fixed meltdown overriding blowout

* how did i miss this

* more heat rebalancing

* icon fix

* not an rbmk!!!

* no sanity allowed on my yogstation

* longer time to fix

* adds a guide in the control room

* fixed the cameras, added a shovel

* okay

* okay

* doesn't need to exist and just causes problems apparently

* Update reactor.dm

* this too

* stuff

* fix

* good enough

* performance

* corium + more performance

* meta map fix

* uh oh

* syndicate preset

* rpd

* i forgor

* Update reactor.dm

* should fix fuel rod crates

* evil theos be like

* Update reactor.dm

* borgs can set up engine

* less tedious to fix

* fix the darn pipes
2023-10-04 15:22:23 -05:00
Byemoh
6ee1224fe8 [BOX] fixes up some map standards (#20460)
* asdsadas

* this
2023-10-03 03:58:32 -05:00
Cark
ee2c1d9a76 [BOX] Det office tweaks (#20471)
* twea

* moves a lightswitch so hard and fast that the pr compiles
2023-10-03 03:41:44 -05:00
Cark
66effec69b brah wtf brah (#20443) 2023-09-25 23:27:22 -05:00
Cark
8631a68bbe Ice Hermit: No Conflicts Edition (#20428)
* Add files via upload

* AAAAAAA

* spanwer
2023-09-24 17:57:40 -05:00
Cark
68824eb2e1 Icemoon: Seed Vault (#20360)
* map

* datum

* fix?

* e
2023-09-24 16:13:55 -05:00
Cark
7895a136c0 New Emergency Shuttle: The Cozy Shuttle (#20393)
* basics

* just needs the dock marker now

* oh im dumb its just a named docking port

* is this really all i have to do?

* wtf

* final touches

* some fixes

* ok

* the crew can have a few firelocks, as a treat

* newbridge

* Update shuttles.dm

* e
2023-09-24 16:11:46 -05:00
Cark
2673957177 New Ghost Role: Icemoon Walkers (#20352)
* basics

* map finished

* datums excluding spawner

* this should be everything

* and done

* ROGUE RAILING

* fixes the issue?

* polish
2023-09-23 15:51:59 -07:00
Cark
3e72ed6b19 [BOX] Fixes interrogation chairs and makes window bigger (#20392)
* whymst

* window
2023-09-21 21:09:54 -05:00
Cark
17e37debe4 wall (#20350) 2023-09-21 21:08:50 -05:00
Cark
1f0fd650a6 [META] Turns the river on the station z-level into a chasm that leads all the way down to the bottom level, ending in the river. (#20383)
* bottom layer

* done
2023-09-21 21:06:56 -05:00
Aquizit
6335a578e1 [Box] Bringing Hydroponics into the modern age with updated trims (#20376)
* TRIMMMMMMMM

* WHO DESIGNED THIS?????
2023-09-20 13:45:31 -07:00
wonderinghost
93aa59ca19 roaming herd of pencil holders (#20251)
* pencilbomb

* final map updated
2023-09-17 22:52:05 -05:00
Cark
640674fc53 Fixes gravity in the Pubby Chapel ruin in the laziest way possible. (#20303)
* gravity woohoo

* camera
2023-09-12 23:29:53 -05:00
Cark
016ce26bac catwalks + cable (#20304) 2023-09-12 23:29:38 -05:00
azzzertyy
ad5b984a36 plasma river (#20272) 2023-09-09 12:34:39 -05:00
Theos
9a02b52d30 Syndicate icemoon base no longer has an emag and ENTIRE RESEARCH SETUP for the specific purpose of :3 (#20265)
* :)

* obliterates problem mechanics from the syndie outpost on icemeta

* turret areas

* buh buh theos you missed a tile this is obviously codebase sabotage

* updated autopsy report

* Forces wing juice to be gained through yet more rng

* spare SMES circuitboards
2023-09-08 20:47:53 -07:00
Addust
fcd06eac23 34tersg (#20246) 2023-09-05 16:01:35 -05:00
Addust
a893d698df Syndicate Icemoon - Revision 2 (#20160)
* 9yh

* 8yy9uo

* fucking FINALLY

* ygh

* a

* wertwerqt

* wethwhrhg

* rtherthw

* the western island

* erthjertj

* rtjhweths

* etyjety

* not sure what i did with this one in all honesty

* fuck that one specific polar bear

* haha

* guh

* ORM that doesnt let you yoinky sploinky station mats

* BWOINK

* bangin donk on it bruv
2023-09-05 13:46:13 -07:00
Addust
2dd3bd44a2 i forgot an air alarm in syndicate lavaland medbay (#20219)
* i forgor

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2023-09-04 11:57:26 -07:00
Addust
62ad25af0c Syndicate Listening Post - Slight Tweaks that May or May Not Be An ided PR but I Do Not Give A Shit (#20209)
* hmmm yes bombs

* fgu6rth

* erghersg
2023-09-03 20:07:38 -07:00
Cark
da1a5dc920 [BOX, META, GAX, ASTEROID] Nukes under window firelocks across all maps, as god intended. (#20179)
* box windows

* missed a couple

* gax windows

* asteroid

* meta
2023-09-01 19:47:12 -05:00
GraveHat
9d8440e0c4 takethemtochurch (#20116) 2023-08-31 11:11:13 -07:00
Addust
4c39d1f9cd cleans the naughty room maint ruin (#20151) 2023-08-31 13:08:59 -05:00
SapphicOverload
a1d146db76 Update IceMeta.dmm (#20153) 2023-08-31 13:07:25 -05:00
Marmio64
1dad2dd66b space syndicate derelict loot changes (#20083)
* replaces e swords with ultra secure c20s and magazines

* one e sword
2023-08-29 13:59:35 -05:00