Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Conversation

@Amelia0010
Copy link
Contributor

so umm...

This started out as a port of mindslaves, without the whole "boomy cartridge" thing (see #26 and #1070)

but in the progress of doing that, I needed the yogstation.dme.

So, I rebased onto ling's project strut branch, which adds the actual DME. soooooooooooooooooooooooooooooooooooooooooooooooooooooooo.

ENJOY!

🆑 AshCorr
add: Mindslaves!
/:cl:

yogstation13-bot and others added 30 commits February 14, 2018 09:39
...and shuts the coderbus door behind him!
* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION
* uses time helpers, tweaks santa/shuttle loan times

* hourS
Amelia0010 pushed a commit that referenced this pull request Dec 24, 2019
* Automatic changelog generation #7183 [ci skip]

* Revert "Label workflow"

* Silicolysis buff (#7127)

* Automatic changelog generation #7127 [ci skip]

* map tweaks

* Adds an achievement for creating a borg as a roboticist (#7204)

* adds an achievement for creating a borg

* locks it to robos only

* adds dilithium canister (#7202)

* Automatic changelog generation #7202 [ci skip]

* Automatic TGUI rebuilding on master branch via Github Actions (#47961)

About The Pull Request

Uses actions to automatically rebuild tgui if files are changed, then push the result.
Triggers on push to master, pushes results to master.

Also disables build checking in Travis because it's unimportant now.

* Update autobuild Github action (#48090)

* demodularise

* tgstation/tgstation#47135

* tgstation/tgstation#47230

* tgstation/tgstation#47585

* tgstation/tgstation#47686

* comms console now allows aghost admins to AI-interact (#7130)

* comms console now allows aghost admins to AI-interact

* fucks

* removes a spare 0 from the tgui-next UI

* Update achievements.dm

name = "Kick Ass and Chew Bubblegum."
	desc = "Kill Bubblegum, the king of slaughter demons." //Should be improved(?)

* Adds Catastrophe achievement

Emag a PA to get it

* Revert "Adds Catastrophe achievement"

This reverts commit 6889f2d.

* Adds the Catastrophe achievement

Emag a PA to get it

* adds a 10% chance of getting a bluespace emag if you emag an emag

* oops

* Automatic changelog generation #7214 [ci skip]

* Automatic changelog generation #7212 [ci skip]

* Automatic changelog generation #7213 [ci skip]

* Automatic changelog generation #7198 [ci skip]

* Update lighting.dm

* #fuck merge conflicts

* powergamers-mad-x24

* fucking ktlsws

* Automatic changelog generation #7131 [ci skip]

* Reworks the achievements subsystem to actually instanciate them

* Adds 3 new achievements

* Apply suggestions from code review

Co-Authored-By: Nichlas Pihl <nichlas00100@gmail.com>

* map things

* Badass syndie achievement

* redesigns testing range

* Add lead lined achievement

* Add wizard win achievement

* Add CPR and changeling win achievements

* Add shadowling ascending achievement

* fix the random parallax layers not working (#7225)

* Automatic changelog generation #7225 [ci skip]

* Add 3 more achievements, one for dying and two related to being cremated

* Automatic changelog generation #7220 [ci skip]

* fixes eggpeople being invisible (#7232)

* Automatic changelog generation #7232 [ci skip]

* Make lockers airtight when welded

* Update marrow_weaver.dm (#7227)

* Automatic changelog generation #7227 [ci skip]

* redoes the achievements UI once more

* adds support for hiding achievement descriptions untill they've been achieved

* fuck you github

* Added the RCD (#7230)

Tested before commit. it works.

* Automatic changelog generation #7230 [ci skip]

* Update autolathe_designs.dm (#7215)

* Automatic changelog generation #7215 [ci skip]

* add short_desc (#7224)

* allows you to create insulin (#7208)

* Update medicine.dm

* retard

* Unoppresses Mentors pt.1 & 2 (#7231)

* tag

* where did that line go

* Update code/modules/client/verbs/ooc.dm

Co-Authored-By: monster860 <mnmaxim@gmail.com>

* Update ooc.dm

* ooc color pref

* bRaCkEtS

* Automatic changelog generation #7231 [ci skip]

* Stray pixels

* Makes Parmesan great again

* strips html on modular computer printer

* Update printer.dm

* department biohazard locker

* Glockroaches (#7229)

* Glockroaches port

Adds glockroaches.

Next commit will be simplemob interactions

* Simple mob interaction

Ports simple mob ineraction from

This will add functionality to add simple mobs

* FUCK

Adds sound.
TG simplemobs are different too.
It works!

* Automatic changelog generation #7229 [ci skip]

* Automatic changelog generation #7245 [ci skip]

* demodularise

* meatball icon

* Clock cult stuff

>More map things.
>Change Airlocks correect airlock. Remove lots of randowm loot Spawners but i still leave some

* Revert "Clock cult stuff"

This reverts commit b903e7a.

* Clock Cult Woot

>More map things.
>Change Airlocks correect airlock. Remove lots of randowm loot Spawners but i still leave some

* Something i forgot

Space makes you float who would of thought...
I forgot that you need the  /area/space/nearstation) when i made this map a long time ago.

* Makes PDA messages use the language system

* Makes paper use the language system somewhat. Removes info_links.

* Automatic changelog generation #7263 [ci skip]

* Now you can use runes on CentCom

mapmerge finally work

* f (#7271)

* Automatic changelog generation #7271 [ci skip]

* fix runtime for using strange reagent on simplemobs (#7267)

* Update medicine_reagents.dm

* Update medicine_reagents.dm

* Automatic changelog generation #7267 [ci skip]

* Makes dilithium crystals visually different from BS crystals (#7246)

* Adds separate dilithium

* Adds own visual

* Automatic changelog generation #7246 [ci skip]

* change fridges to bar access

* [s] Fixes a couple of exploits (#7273)

* Update drink_reagents.dm

* Update other_reagents.dm

* Update food_reagents.dm

* Automatic changelog generation #7273 [ci skip]

* f

* Adds new player friendly to the server title

### Intent of your Pull Request

Maybe it will attract more players


#### Changelog

:cl:  
  
tweak: changes hub line
/:cl:

* okay

makes | not

* aeeeeeeeaeaeaeaeaeaeaeaeaeaeaee

merge my pr

* Adds BUG option to adminhelp admin menu

* Automatic changelog generation #7221 [ci skip]

* Automatic changelog generation #7277 [ci skip]

* fixkckc

* Automatic changelog generation #7281 [ci skip]

* Update species.dm

* a

* Update human_defines.dm

* Update dna_vault.dm

* Update human_defines.dm

* Update dna_vault.dm

* Update cult_items.dm

* Automatic changelog generation #7222 [ci skip]

* Automatic changelog generation #7251 [ci skip]

* gloves of the north star can no longer be exploited (#7283)

* Automatic changelog generation #7274 [ci skip]

* f

* Ninja jail is no longer permanent (#7178)

* Add files via upload

* ninja man explodes

* Ignore that.

* Use list instead of trait and makes the proc go off after the implant activation rather than as soon as you click the icon

* fuck

* the hell is a newline

* Update ninja.dm

* goddamnit

* Checks if the player is actually still in the dojo

* Automatic changelog generation #7178 [ci skip]

* Revert "Ninja jail is no longer permanent (#7178)" (#7287)

This reverts commit f5b602c.

* Automatic changelog generation #7286 [ci skip]

* Automatic changelog generation #7276 [ci skip]

* Test 

jobama

* wording fix HONK

fuck!

* Animates dab emote (#7290)

* Automatic changelog generation #7290 [ci skip]

* Revert "Animates dab emote (#7290)" (#7291)

This reverts commit 7a257e7.

* Revert "Revert "Animates dab emote(#7290)" (#7291)"

* Theos be like

Okay boomer

* Coco now using milk instead of water

Super important please fix!

* LoneOP? ON MY TEST SERVER!?

* Create FUNDING.yml

* Automatic changelog generation #7293 [ci skip]

* Automatic changelog generation #7278 [ci skip]

* Automatic changelog generation #7226 [ci skip]

* Automatic changelog generation #7234 [ci skip]

* Automatic changelog generation #7262 [ci skip]

* Automatic changelog generation #7216 [ci skip]

* Automatic changelog generation #7265 [ci skip]

* Automatic changelog generation #7295 [ci skip]

* I guess

* Automatic changelog generation #7270 [ci skip]

* Update autobuild_tgui.yml

* this is just a test, I'll revert it later

* lol

* Automatic TGUI Rebuild [ci skip]

* auto-build is gone 🦀

* achive

* server

* Makes written initialize in Initialize() in paper.dm

* Update uplink_items.dm

* Moves some code around and creates /proc/scramble_HTML for languages

* Allows the prewritten text on paper to also have a language

* Forgot to push a line fuck

* Fixes missing variable compiletime in paper.dm

* Makes several premade papers have a language they're written in

* someone said this was important to note

* Update CODEOWNERS.md [ci skip]

* emag does the thing

* Map changes for monstermos

* Automatic changelog generation #7307 [ci skip]

* more non sense

* Adds language to prewritten papers defined in /yogstation/code/

* Automatic changelog generation #7304 [ci skip]

* [s] (#7292)

* Update reinf_floor.dm

* Update pipe.dm

* Conveyor belts stack to 30 (#7294)

Fixed. It compiles.
Fixed. It works!

* Automatic changelog generation #7294 [ci skip]

* adds a tacti cool kit based off of neo (#7233)

* neo

* Update code/game/objects/items/storage/uplink_kits.dm

Co-Authored-By: Theos <theubernyan@gmail.com>

* Update uplink_kits.dm

* stimulants

* Update uplink_kits.dm

* Update uplink_kits.dm

* Automatic changelog generation #7233 [ci skip]

* adds stormtrooper armor and helmet and a cargo crate for them working edition maybe thanks to missatesatessy for heping me (#7256)

* Add files via upload

* Update packs.dm

* Update armor.dm

* Update helmet.dm

* i deleted all new crates by mistake this should fix it

* Update packs.dm

* Automatic changelog generation #7256 [ci skip]

* wouldthisfixit? (#7313)

* Update motd.txt

* beep

* Automatic changelog generation #7317 [ci skip]

* ssssssssss

* Automatic changelog generation #7319 [ci skip]

* I think this does the thing probably tm

* cringecode

* Update dna_vault.dm

* bruh moment

* fixed the code

* Automatic changelog generation #7282 [ci skip]

* Automatic changelog generation #7303 [ci skip]

* Automatic changelog generation #7312 [ci skip]

* Automatic changelog generation #7268 [ci skip]
Amelia0010 pushed a commit that referenced this pull request Dec 24, 2019
This reverts commit c1c6e96.
Ktlwjec1 pushed a commit that referenced this pull request Mar 5, 2020
Ktlwjec1 pushed a commit that referenced this pull request Mar 27, 2020
alexkar598 added a commit that referenced this pull request Mar 28, 2020
* Adds an achievement for surviving as a cargonian

* Adds an achievement for getting 1,000,000 credits

* Adds an achievement for claiming the 10th cargo bounty

* Adds an achievement for firing the BSA

* Fixes compiletime due to bad string

* Fixes BSA achievement not always firing when firing

* Fixes bad indentation in bsa.dm

* Attempts to fix the "achievements not reading nor writing to DB" problem

* Attempt #2 at fixing achievements wholesale not working

* Adds like a submicrosecond optimization

* Sanitizes ckeys that're input into achievement queries

The use of ckey() is actually enough to ensure an inability to do SQL injection.

* Makes unlock_achievement always check if client exists

* Removes the BSA achievement granting when firing thru artillerycontrol

* Makes the bourgeois achievement grant on all with same real_name as millionaire

* Update account.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
nesisknesis pushed a commit that referenced this pull request Mar 30, 2020
alexkar598 pushed a commit that referenced this pull request Apr 19, 2020
nesisknesis pushed a commit that referenced this pull request Apr 24, 2020
Ktlwjec1 pushed a commit that referenced this pull request Jun 1, 2020
* onion?

* copypasted with touchups

* pippes
Yogbot-13 pushed a commit that referenced this pull request Mar 4, 2021
Yogbot-13 pushed a commit that referenced this pull request Apr 25, 2021
@Cartlord Cartlord mentioned this pull request Nov 14, 2022
Yogbot-13 pushed a commit that referenced this pull request Mar 19, 2023
Yogbot-13 pushed a commit that referenced this pull request Jul 16, 2023
* remove tiles

* forgot some red tiles

* farts

* done
ToasterBiome added a commit that referenced this pull request Aug 14, 2023
* 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 9a6aaee.

* 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 62cecf7.

* 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 82e3ad1, reversing
changes made to 9d918cf.

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

This reverts commit 9d918cf, reversing
changes made to f06088b.

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

This reverts commit f06088b, reversing
changes made to c217b19.

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

This reverts commit e4e6180.

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

This reverts commit 6982c47.

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

This reverts commit 5ea59d7.

* 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 969dc70.

* 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 c13270e.

* Revert "this might work idk"

This reverts commit 495db72.

* Revert "dumbass ned"

This reverts commit cd59b84.

* Revert "i think this is right"

This reverts commit 63a858a.

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

This reverts commit b332d0f.

* 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 986fa06.

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

This reverts commit 6d7bed5.

* 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>
Kell-E added a commit to Kell-E/Yogstation that referenced this pull request Sep 27, 2023
MajManatee pushed a commit that referenced this pull request Oct 19, 2023
* ok

all redone

* fixes this

idiot

* im stupid

idiot

* im stupid x2
AMyriad referenced this pull request in AMyriad/YogsFork Dec 4, 2023
Moltijoe pushed a commit that referenced this pull request Dec 6, 2023
* Update nordic_accent.json

* fix

* Update accent_nordic.json

* Update accent_nordic.json

* Update accent_nordic.json

* Update accent_nordic.json

* Update accent_nordic.json

* Update accent_nordic.json

* Update accent_nordic.json

* Update accent_nordic.json

* Update accent_nordic.json

* Update accent_nordic.json

* Update accent_nordic.json

* Update accent_nordic.json

* alright this is fine now

* removes this cringe first

* fixed
Moltijoe pushed a commit that referenced this pull request Dec 6, 2023
…pital "T" from all mentions of "NanoTrasen" (#21043)

* Update wanted_message.json

* Update yogs_ion_laws.json

* this too

* Update cryopod.dm

* Update headset.dm

* Update topic.dm

* Update nuclearbomb.dm

* Update corpse.dm

* Update expressconsole.dm

* Update jobs.dm

* Update miscellaneous.dm

* Update captain.dm

* Update machine_vending.dm

* Update gimmick_objectives.txt

* Update infiltration.dm

* Update parts.dm

* think I did this right

* no apparently I didn't

if this works, it only dies on mapping stuff

* fixed?

* tests the linter to see if the grep catches this

* test didn't work, reverts last commit

* test #2: does it detect case sensitivity?

* test worked, I think it's done!

* Update check_grep.sh

* Update check_grep.sh

* Update check_grep.sh
Yogbot-13 pushed a commit that referenced this pull request Jul 14, 2024
Scrambledeggs00 referenced this pull request in Scrambledeggs00/Yogstation Aug 5, 2024
Moltijoe pushed a commit that referenced this pull request Aug 14, 2024
* Started groundwork for new vat

* forgot a space

* Started on TGUI code

* Continued work on TGUI code and ui_data

* I do not like TGUI

* Borrowed code from food cart

* Getting there

* More tweaking

* Fixed amount problem

* UI is dead

* Fixed TGUI list stuff

* Image fixed

* Messed with UI layout

* Finished base UI and gave thanks

* Added comments and general code improvements

* Fixed typos and changed actions in UI

* ui_act for selecting and dispencing items

* Improved dispensing and selecting code

* Added alt click interaction and extra examines

* Deselecting and attackby for adding to vat

* Now stores items rather than type paths

* Added carton interaction with vat

* Selected item's select ui button now becomes green

* lets you scoop cones with right click

* Start with new cones

* Finish cone crafting and started with tabs

* Attempt #2 at getting tabs to work

* Vat tab now works as intended

* Messed with info tab layout

* Finished work on tabs

* Replaced original vat code and improved code

* Removed ice cream from borg dispencers

* Removed creamatorium ;[

* Removed duplicate item from black list

* Finishing touches

* Fixes for Lint tests

* More fixes for Lints test

* Shortens info tab text
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game

Projects

None yet

Development

Successfully merging this pull request may close these issues.