Commit Graph

26 Commits

Author SHA1 Message Date
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
Ezhan
6edfeeb297 Adds """some dude""" as a pre legion fight definitely a miniboss(just a mob) (#19234) 2023-06-13 08:59:26 -05:00
Vaelophis Nyx
f3fefacfe1 Removes Bowl of Blood From Necro Chest, Moves it to the necropolis, adds replacement item Blindfold of Telepathy (#16120)
* Update necropolis_chests.dm

* Update Lavaland.dmm

* Update necropolis_chests.dm
2022-10-22 13:42:55 +01:00
nmajask
0fb400104a Ports hyposprays MK. II (#14814)
* cit hypos

* pain, suffering even

* maps too

* kilo as well

* delta fix

* syndicate hypospray + kit

* qmc sprite

* red crosses bad

* agh
2022-07-16 16:08:47 +01:00
Byemoh
8525a40b6b Mining Rework 1.9999: Kills turf based mining generation and replaces it with Cellular Automata cave generation (#14528)
* Update config.txt

* ok

* Update Lavaland.dmm

* Update LavalandGenerator.dm

* help

* fuck you

* yep

* fuck these turfs

* yeah

* Update rust_g.dll

* Update dependencies.sh

* Update dependencies.sh

* thank you merger

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-07-09 13:12:58 +01:00
Byemoh
c05cb71730 Mining Rework 1.5 - Okay now lets blow things up! (#14173)
* moves stuff + upgrade parts

* yes

* Update world_anvil.dm

* removes world anvil

* world anvil

* simplifies world anvil code

* Update world_anvil.dm

* blasma shotgun

* bruv

* Update layout.dm

* Update machine_vending.dm

* Update machine_vending.dm

* Apply suggestions from code review

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update upgrades.dm

* Apply suggestions from code review

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update miningbase.dmm

* whoops

* Update upgrades.dm

* Update world_anvil.dm

* Update world_anvil.dm

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
2022-06-11 13:50:12 +01:00
Byemoh
c964e3a335 Lavaland Mining Rework #1: What do you mean I have to mine?? (#13185)
* mining ayyy

* default power is 1 + fix plasma cutter

* mining charges + hardness changes + lightens icon

* admins

* Update minerals.dm

* Update minerals.dm

* Update minerals.dm

* Update mining_charges.dm

* Update minerals.dm

* upgrades

* fixes bugs

* Update world_anvil.dm

* ow

* Update code/modules/mining/lavaland/world_anvil.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/mining/lavaland/world_anvil.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/mining/lavaland/world_anvil.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/mining/lavaland/world_anvil.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/mining/lavaland/world_anvil.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/mining/equipment/mining_charges.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* fixes stuff

* Update code/modules/mining/lavaland/world_anvil.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* bad cowbot

* fixingg buggsss

* Update kinetic_accelerator.dm

* new spritz

* no free c4

* Update energy.dmi

* Update mining_charges.dm

* Update resonator.dm

* Update resonator.dm

* inhands

* adv plasmacutter inhand sure

* Update world_anvil.dm

* no ghosts

* Update minerals.dm

* yeah this is probably fine

* Update mining_charges.dm

* Update mining_charges.dm

* Update mining_charges.dm

* Update mining_charges.dm

* Update world_anvil.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-03-27 12:36:20 +01:00
nmajask
407122e347 Adds modular PDA and Telescreen and cleans up some of the preset code (#12685)
* Added modular PDA and telescreen

They kinda work

* Adds a telescreen to box

* Cleans up some stuff

Left some code in from when I was working on something else, causing the checks to fail. This removes it.

* More clean up and an untested fix for computers so they dont runtime if they have an initial program

Hope this works.

* Hopefully fixes the failed check

Forgot about that var.

* Makes telescreens machines and more PDA sprites

Makes modular telescreens machines, adds more pda program icons, and fixes stuff.

* Adds telescreens to more maps and fixes the one on box

* Fixes the failed check and cleans up some commented out stuff

Forgot about this stuff

* Replaces engi and atmos tech phones with modular PDAs

Seams reasonable. May atomize it out if people want me to.

* Forgot the commit the atmos preset

*sigh

* Moves telescreens to the machine folder and adds a medical telescreen

Moves telescreens to the machine mod pc folder because they are no longer items and adds a medical telescreen that starts with the crew monitor program, though its not on maps yet.

* Removed the old telescreen file that didnt get removed

thanks github desktop

* Forgot about the CMO's computer

Though I did this with the medical preset

* Adds medical telescreens to most maps

* Readds the changes

* Forgot to uncomment this

*scream

* Adds telescreens to mining base and brig infirmary

* Everyone gets a telescreen

* Forgot the lights

* Symmetry

* Adds the fixes for delta
2021-12-27 17:24:30 -05:00
Redmoogle
7777795e16 Fixes smes charge levels (#12988) 2021-12-26 15:20:33 +00:00
wejengin2
80549d5c2b Gulag gets a pacman generator (#11384)
* t

* 25 sheets of plasma
2021-04-25 12:24:27 +00:00
ChesterTheCheesy
069bbef6ed Tweaks the lavaland ruin behind Legion to be more of a lair (#11259)
* Update Lavaland.dmm

* fixes the twin crusader
2021-04-25 11:14:08 +01:00
alao3alao3
62ce453dfe Adds Lavaland Ruin Behind Legion (#11124)
* oop

* adds a skeleton key to legion drops

* adds skeleton key and locked necropolis door

* adds necropolis puzzledoor

* Delete puzzle_small.dmi

* adds a skeleton key sprite

* Update puzzle_pieces.dm

* i accidentally made legion drop a locked door instead of key

* Update Lavaland.dmm

* makes area for the area behind the legion

* uses the damn area and cleans up stuff

* extinguisher and lavas

* current

* ruin

* since when was material loot useful

* if you insist

Co-authored-by: ChesterTheCheesy <71487903+ChesterTheCheesy@users.noreply.github.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Co-authored-by: wejengin2 <48154165+wejengin2@users.noreply.github.com>
2021-03-27 15:49:19 +00:00
alao3alao3
307dec5aed Adds and Moves a Few Extinguisher Cabinets (#11101)
* Adds and Moves Around Extinguishers

* minor change

* minor fix 2

* minor fix 3: revenge of the poor logic

* places gulag extinguisher in Labor Camp Security, where it will never be reached

* late suggestion

* turns my extinguisher pr into a light pr by adding a single light

* manually fixes conflict

* chew ass and kick gum

* Update bar_cheese.dmm

* Update bar_cheese.dmm

* what type of abbot & costello shit is going on

* reverts?

* nothing changed??
2021-03-15 09:43:03 +01:00
wejengin2
7d9ff948d2 [boring] Fixes apc map errors (#10600)
* pixels

* validated
2020-12-11 09:17:25 +00:00
Jamie D
266b3f47bc Atmospherics Patch 1 - No map edition (#10505)
* Atmospherics Patch 1 - No map edition

* ffs

* brick

* Update hot_ice.dm (#10513)

* Automatic changelog generation #10513 [ci skip]

* brick

* Bug unintended feature /shrug

* Adds electrolyzer to Toxins

* oh

* Revert

* REEE

* Update YogStation.dmm

* Fucking maps

Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: Yogbot-13 <admin@yogstation.net>
2020-12-06 15:54:49 +00:00
Jamie D
d0cef42e36 Huge Atmospherics Update - Five layer pipes and new funny gases (#10447)
* AHHHHHHHHHHHHH

* oopsie

* Fucking extools, who would of guessed

* eee

* MAPS GO BRRRRR

* Icons

* Update code/modules/atmospherics/machinery/portable/canister.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/game/objects/items/grenades/atmos_grenades.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/atmospherics/gasmixtures/gas_mixture.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* More shit

* Update basemats.dm

* Cock and Balls

* oh my god kill me please I hate gases and colton is a slave master someone call the cops he is after me and I dont feel good. I need some help here because I dont know what im doing and im very scared.

* Fuck off linter

* HMMMMMMMM

* Hmm?

* afasggsag

* REEEE

* COMPI:E BAD

* Hmmmm

* icons maybe

* T mixer

* Icons

* Ree

* Please work

* Fucking yogs folder

* Reeee

* Icon and runtime

* Reee

* Indents

* MIXER GO BRRR

* E

* Last update of the night

* oopsie

* Linter go Brrr

* REEE

* MOre fixes

* e

* Electroshitter

* EEE

* FUCK

* Maybe makes this work

* tg bad

* Come at me linter.

* Fucking oops

* Update electrolyzer.dm

* LINTER GO TO HELL - GIMMIE DAT GREEN TICK

* Im dumb

* E

* Update electrolyzer.dm

* Fixes vents

* Fixes

* E

* Fucking Jank code is jank

* R

* r

* Update tgui.bundle.js

* fucking moja just used goddamn find and replace

* Theos

Co-authored-by: Hopekz <hopekxx@gmail.com>
Co-authored-by: Theos <theubernyan@gmail.com>
2020-11-26 20:54:29 +00:00
wejengin2
61ff1cad15 man (#10343) 2020-11-08 11:43:31 +00:00
Marmio64
733c82971b stuff (#10214) 2020-10-29 11:05:48 +01:00
wejengin2
309e682a2f Better gulag (#10173)
* done

* ilght
2020-10-27 09:30:24 +00:00
MonsWTF
5fc843ba7e The Toxins Update - New machine & miner map tweaks (#9608)
* LAM completed - GPS' updated

* L.A.M. Installed

* woops, tracking offline GPS coords

Also fixing Lavaland roundstart GPS displays from showing active despite being turned off for safety purposes.

* Code cleanup before PR

* Removing unnecessary var

var/loaded and var/scibomb really were being used for parallel cases. Yeet.

* Last pass before PR

One more ingame test to make sure I didn't break anything.

* Just kidding, one more.

Found another missed check.

* Those should be 0 too.

* autodoc?

* Re-adding LAM to Meta

* Pair in theses

* Literally no point in keeping this since you can visually see if there's a bomb

* Even more autodoc?

* Oops spacing

* Z-level tracked in Init, Countdown timer switched to max()

* Re-building tgui to include LAM

And apparently my master was missing reflector + feral_cat adjustments...?

* Rebuild tgui

* fixing conflicts

* box

* meta

* delta

Co-authored-by: Jean <wuatduhf@gmail.com>
Co-authored-by: wejengin2 <patpol4@protonmail.com>
2020-10-25 17:53:57 +00:00
FLME
cc1492f1d7 icefix2 (#9868) 2020-10-07 09:32:23 +01:00
FLME
48683ebb25 minor icebox improvements (#9759)
* icebox

* iceboxxers

* ice-ice-copyright-strike

* fuck

* 4 masks

Co-authored-by: wejengin2 <patpol4@protonmail.com>
2020-09-29 14:47:48 +02:00
ToGWtF
174ee1985d adds tiny fans to labor camp (#9044) 2020-06-29 07:38:14 +01:00
alexkar598
e9b8ac16cb pt 3 2020-03-30 13:30:54 -04:00
alexkar598
6450964051 pt 2 2020-03-30 13:30:43 -04:00
alexkar598
09bc89e31e pt 1 2020-03-30 13:30:18 -04:00