This repository was archived by the owner on May 22, 2025. It is now read-only.
:) #3
Merged
:) #3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
byond now as of 1413 only lets you define debug inside the dme, so this was pointless.
Remove two unused procs and move another to the mob/living say where it is used
Gave camera mobs the ghost verb
* Adds Medical Sprays Medsprays are a new application method for chemicals, functioning like a multi-use patch with an internal chemical reservoir. This allows touch chemicals to be applied more precisely and with a delay, rather than instantly and imprecisely with a spray bottle. Pre-loaded medsprays with styptic powder or silver sulfadiazine can be obtaiend from the NanoMeds, and empty ones will spawn in the secure chemical locker. They will also come from the medical pack from cargo. * Update packs.dm * Volume adjustment, attack_self addition * Adds Medical Sprays Medsprays are a new application method for chemicals, functioning like a multi-use patch with an internal chemical reservoir. This allows touch chemicals to be applied more precisely and with a delay, rather than instantly and imprecisely with a spray bottle. Pre-loaded medsprays with styptic powder or silver sulfadiazine can be obtaiend from the NanoMeds, and empty ones will spawn in the secure chemical locker. They will also come from the medical pack from cargo. * Volume adjustment, attack_self addition * Adds Medical Sprays Medsprays are a new application method for chemicals, functioning like a multi-use patch with an internal chemical reservoir. This allows touch chemicals to be applied more precisely and with a delay, rather than instantly and imprecisely with a spray bottle. Pre-loaded medsprays with styptic powder or silver sulfadiazine can be obtaiend from the NanoMeds, and empty ones will spawn in the secure chemical locker. They will also come from the medical pack from cargo. * Volume adjustment, attack_self addition * Forgot this * removes unnecessary/annoying check * replaces deprecated sterilizer spray bottles on Pubby * Applies MrDoomBringer's sprites * new sprites, by @MrDoomBringer * two-line shuffle * fixes double entry * Adds logging * code standards
* Adds detection for spoofed 512 clients * actually reject the client. * Fixes Shift Failure
…eing assigned a random one.
… mobs to place the ghost's client in the camera Fixed mutable var not being copied from advanced viruses
Removes DEBUG from compile_options.
Allows map configs to set how many ruin levels (def. 7) and how many empty levels (def. 1) that will be created. Most useful for landlocked stations, event/one-off stations with unusual composition, or testing situations such as RuntimeStation.
* FUCK * requested changes * deletes duplicate pipe * removes duplicate APC, moves air alarm * fixes circuitry maint door's area
* makes thirteen loko do the stuff it warns the person about * you sceam in terror as you use the web editor!
* Refactors beacons * Updates maps * Done * aaddddasddsafsdf
Small spellcheck in traits
Disease fixes
…trait additions in comments] (#35475)
Floyd / Qustinnus (Sprites by Ausops, Some moodlets by Ike709)
add: Adds mood, which can be found by clicking on the face icon on your screen.
add: Adds various moodlets which affect your mood. Try eating your favourite food, playing an arcade game, reading a book, or petting a doggo to increase your moo. Also be sure to take care of your hunger on a regular basis, like always.
add: Adds config option to disable/enable mood.
add: Indoor area's now have a beauty var defined by the amount of cleanables in them, (We can later expand this to something like rimworld, where structures could make rooms more beautiful). These also affect mood. (Janitor now has gameplay purpose besides slipping and removing useless decals)
remove: Removes hunger slowdown, replacing it with slowdown by being depressed
imageadd: Icons for mood states and depression states
What this PR is
This PR adds a system that allows player to gain and lose moodlets based on events occuring to, and around them. These events then give the player a mood value based on what it is. For example a hug could give you +1 mood, while being stabbed in the eye with a screwdriver can give -5 mood. All these moodlets together determine the mood of your character which currently affects the following things:
Movement speed - If you are very sad you move slower. Replacing movement slow from hunger. (hunger now instead affects mood)
Screen blur - If you are sad you gain an overlay that slightly blurs the screen, increasing in severity as you get sadder.
Interaction / do after speed - If you are sad or happy your interaction speed with things such as handcuffs is changed. with a 25% longer time if you are sad, or 10% shorter time if you are extremely happy.
Hunger rate - You gain hunger slower if you are very happy.
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever. Techfabs do not link to RND consoles, and have their own interface for producing things. RND production machinery code refactored. Techwebs have categories views instead of just a goddamn design list. Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc. experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
* caps fixed, small other fixes and mushpunch * honey, i fixed the bugs! * STUPID YORII DUMB GIRL STINK LEAVE * boolean is such a fun word * zoinks * F_XED * fixes part 2 * TRUEs and FALSEs * don't drink and code boys unless you're goofball or like maybe kor * for entirely different reasons i mean * at what point is goofball too drunk to troll but not drunk enough to shitcode * cool your jets, travis. * what a TRAVIS-TY * mush added to yet another blacklist!
Fixes delta incinerator
Amelia0010
pushed a commit
that referenced
this pull request
Feb 13, 2019
fluffe9911
pushed a commit
that referenced
this pull request
Jul 13, 2019
fluffe9911
pushed a commit
that referenced
this pull request
Jul 16, 2019
Amelia0010
added a commit
that referenced
this pull request
Aug 3, 2019
IAA Change #3 - Makes IA agents spawn with a cyanide dental implant
Amelia0010
pushed a commit
that referenced
this pull request
Aug 17, 2019
Amelia0010
pushed a commit
that referenced
this pull request
Oct 8, 2019
Ktlwjec1
pushed a commit
that referenced
this pull request
Mar 27, 2020
Yogbot-13
pushed a commit
that referenced
this pull request
Jul 16, 2023
* 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
ToasterBiome
pushed a commit
that referenced
this pull request
Aug 1, 2023
* please let this work (#1) * ho * pod nerfed by a pod main * sugone * yea * yer * lotsa stuff * tgui is pain * i don't know * maybe? * god kill me * tailed * wait no i fixed it wrong, this should be better * SCOPE CREEP BABEEEEEEEEEE * sins * mother of all omlettes jack * is it over? * ethereal colors because idk * i think that's it until we find out what else i broke cl ass clean up debug messages last one probably * Revert "i think that's it until we find out what else i broke" This reverts commit 574b0e8. * last time with gusto * hhh * ho * pod nerfed by a pod main * yer * fix * Revert "fix" This reverts commit 979eddb. * Delete plantpeople.dm * Revert "Merge branch 'dna-blocks-but-like-good' of https://github.com/Chubbygummibear/Yogstation-TG into dna-blocks-but-like-good" This reverts commit 1756ff2, reversing changes made to 05f88be. * this shouldn't be in here * missed that * so many little things * please for the love of god work * that might be it * may the future not suffer as we have in the past * higher version because it only updates sometimes * works * reorder those cause yog is snowflake * updated * conflicting mutations fix * alright we're good to go AGAIN * glowy and extendo colors work again * please let this work (#1) * ho * pod nerfed by a pod main * sugone * yea * yer * lotsa stuff * tgui is pain * i don't know * maybe? * god kill me * tailed * wait no i fixed it wrong, this should be better * SCOPE CREEP BABEEEEEEEEEE * sins * mother of all omlettes jack * is it over? * ethereal colors because idk * i think that's it until we find out what else i broke cl ass clean up debug messages last one probably * Revert "i think that's it until we find out what else i broke" This reverts commit 574b0e8. * last time with gusto * hhh * ho * pod nerfed by a pod main * yer * fix * Revert "fix" This reverts commit 979eddb. * Delete plantpeople.dm * Revert "Merge branch 'dna-blocks-but-like-good' of https://github.com/Chubbygummibear/Yogstation-TG into dna-blocks-but-like-good" This reverts commit 1756ff2, reversing changes made to 05f88be. * this shouldn't be in here * missed that * so many little things * please for the love of god work * that might be it * may the future not suffer as we have in the past * works * reorder those cause yog is snowflake * updated * conflicting mutations fix * alright we're good to go AGAIN * glowy and extendo colors work again * it compiles * the adds antags pr is the worst thing i've ever seen * Revert "the adds antags pr is the worst thing i've ever seen" This reverts commit b18dc91. * i need github to stop being a shit for 2 seconds * i didn't even need those god dammit * can i go now
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 <[email protected]>
Yogbot-13
pushed a commit
that referenced
this pull request
Jul 19, 2024
do not merge until i say bgitch
Moltijoe
pushed a commit
that referenced
this pull request
Aug 8, 2024
* pee * strange reagent fix * smell mop * throwing? * evaporation + more effects * Update pyrotechnic_reagents.dm * doors/airlocks * smell mop * Update liquid_groups.dm * borbop changes * breathing in liquids * fixes liquids going into dense tiles * increases mopcap to 45 * liquids fixes * lol * more liquid stuff * fixes this * more changes * fix all this stupid stuff * fix phantom pixel * liquid pump fix * gives you better ability to scoop things up * fix liquid pump * BUUURN BABY BURN + blud * slipping reaction checking * change liquid push reaction * removes liquid_fire_power
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
:)