This repository was archived by the owner on May 22, 2025. It is now read-only.
Ports "Give mood buff for defibbing someone" #14423
Merged
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
added 10 commits
June 2, 2022 13:39
Author
|
Fuck |
SomeguyManperson
approved these changes
Jun 18, 2022
Yogbot-13
added a commit
that referenced
this pull request
Jun 18, 2022
Bibby0110
added a commit
that referenced
this pull request
Jun 28, 2022
…gly airlocks (by adding indestructible walls) (#14635) * iaa dust implant (#14402) * Automatic changelog generation #14402 [ci skip] * yes plz (#14403) * Update crawl.dm (#14408) * Automatic changelog generation #14408 [ci skip] * who could have guessed that you shouldn't check for empty AFTER IT'S USED (#14409) * Automatic changelog generation #14409 [ci skip] * glowshroom cancer (#14410) * Automatic changelog generation #14410 [ci skip] * Update spellbook.dm (#14394) * Automatic changelog generation #14394 [ci skip] * "This area feels nice" (#14401) * Automatic changelog generation #14401 [ci skip] * Adds a user warning when someone tries to fry a brain with a deepfryer. (#14416) * Adds a warning * punctuations exist apparently * Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm * Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com> * Automatic changelog generation #14416 [ci skip] * Automatic changelog compile [ci skip] * Automatic changelog compile [ci skip] * does sa thing that makes probably the miner gpses spawn with numbersand not spawn on lavaland corpses (#14435) * does sa thing that makes probably the miner gpses spawn with numbers and not spawn on lavaland corpses * Update shaft_miner.dm * Update shaft_miner.dm * no more double mining medic gps * Automatic changelog generation #14435 [ci skip] * Automatic changelog compile [ci skip] * Adds a new 3x3 vendor-accident themed maint ruin & patches station.dm missing spaces (#14406) * Adds a new 3x3 maint ruin Adds a new 3x3 maint ruin consisting of 4 vendors, some minor loot, and deco. * renamed ruin Renamed ruin for clarity * add new maint ruin to station.dm fixes maint ruin not being listed, because I didn't know * update entire stations.dm file who forgot the spaces lmao * update station.dm to include author credit for new ruin * corrected author credit changed to ckey from github username * update map file * update map file again why did it not save the credit chip change??? * added light to left side of ruin * Automatic changelog generation #14406 [ci skip] * window fix (#14445) * Automatic changelog generation #14445 [ci skip] * Automatic changelog compile [ci skip] * Adds root beer to the game (I FUCKING LOVE MUG!!!!!!!!) (#14439) * GIVE ME MY ROOT BEER!!!!! * fix * Automatic changelog generation #14439 [ci skip] * no more leftover assets (#14430) * Automatic changelog generation #14430 [ci skip] * Stops Admin Lagging the Game (#14426) * Automatic changelog generation #14426 [ci skip] * Automatic changelog compile [ci skip] * Automatic changelog compile [ci skip] * fixes bad capitalizeations (#14489) * Automatic changelog generation #14489 [ci skip] * rubber shot better? (#14438) * Automatic changelog generation #14438 [ci skip] * Ports "Give mood buff for defibbing someone" (#14423) * Update computer.dm * Update meat.dm * Update objects.dm * Update generic_positive_events.dm * Update defib.dm * Update human.dm * Update objects.dm * Update meat.dm * Update computer.dm * Automatic changelog generation #14423 [ci skip] * z (#14478) * Automatic changelog generation #14478 [ci skip] * Automatic changelog compile [ci skip] * Updates tech web layout for AI techs (#14482) * Update layout.dm * Update layout.dm * Automatic changelog generation #14482 [ci skip] * Update ai.dm (#14483) * Automatic changelog generation #14483 [ci skip] * Automatic changelog compile [ci skip] * Bluespace Locker Nerf Proposal [2 of 2] (#14288) * bluespace locker Teleport * dont del locker * pick new locker * Automatic changelog generation #14288 [ci skip] * Ports TG's stomach pumping surgery. A way to remove the 400u misc narcotics from someone who's dead (#14348) * i hate vomit code * toxic * Theos approved code Co-authored-by: Theos <theubernyan@gmail.com> * Anvil words Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com> * anvil code Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com> Co-authored-by: Theos <theubernyan@gmail.com> Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com> * Automatic changelog generation #14348 [ci skip] * Basalt Katana fauna damage buff and new mechanic: A Dodge roll (#14405) * LOOK AT THE MOVES * Literal phone edit * Automatic changelog generation #14405 [ci skip] * Foolproofs vending machine being spawned tipped by mappers (#14415) * Allows mappers to spawn tilted vending machines * Foolproofs tipped vending machine spawn * Update _vending.dm * whoops, unneeded * meant to do this * Why did I create this variable * No longer drunk so am able to see why I needed it * makes some of the recent megafauna drops less shit (#14455) * this is everything i think idk it's 330am * polishes some things for now therell probably be more later * Update miscellaneous.dm * fuck it critical heal * you're able to the body entirely * Automatic changelog generation #14455 [ci skip] * Fixes pacifism touch cooldown (#14417) * Update touch_attacks.dm * Update touch_attacks.dm * Update touch_attacks.dm * Automatic changelog generation #14417 [ci skip] * you can now shoot over people who are near you if they are resting (#14461) * you can now shoot over people who are near you * Update projectile.dm * Update projectile.dm * Automatic changelog generation #14461 [ci skip] * Adds New 10x10 Maintenance Fishing Ruin (#14465) * Create 10x10_fishinghole A fishing ruin! set up with a partial kitchen, vendors, and some goodies for mainteneers to find. * adds new ruin to station.dmm * add railings around the fishing pond * Automatic changelog generation #14465 [ci skip] * gangrel transform fix (#14412) makes transform work properly and actually be useful * Automatic changelog generation #14412 [ci skip] * Slight arrow tweaks (#14431) * Automatic changelog generation #14431 [ci skip] * Secbelt + shotgun shell boxes rework, shoulder holster and bandolier buff (#14433) * inb4 webbing meta * bandolier buff + shell box time * oops beanbags were missing * may the lord and savior save me pretty please * hos now spawns with belt * re-adds baton/cuffs/flash to locker * Automatic changelog generation #14433 [ci skip] * Adds stored research and makes toxins bombs apply it instead of directly producing points (#14442) * h boy this is going to b efun * Update research.dm * Update _techweb.dm * Update research.dm * nearly caused an incident * Automatic changelog generation #14442 [ci skip] * Makes fishing loot make sense + fishing icon fix + collapsible rod (#14448) * hmm yes * fixes * Automatic changelog generation #14448 [ci skip] * WT Tweak/Buff (#14440) * gun go pew pew = fun * 22 is symmetrical * Update code/modules/projectiles/guns/ballistic/automatic.dm Co-authored-by: Theos <theubernyan@gmail.com> * Automatic changelog generation #14440 [ci skip] * admin v admin tickets (#14459) * Preternis.... buff?? Preternis eyes no longer delete themselves in non-Preternis and instead take damage (lose power) and recharge (heal) in Preternis (#14462) * mmmmmmm eye * comments and capitals * examine text and space * Automatic changelog generation #14462 [ci skip] * Ports "Podpeople inherit their blood chemical from the most abundant chemical trait in their seeds" (#14425) * Update computer.dm * Update meat.dm * Update objects.dm * Update replicapod.dm * Update podpeople.dm * Update computer.dm * Update meat.dm * Update objects.dm * Update replicapod.dm * Automatic changelog generation #14425 [ci skip] * pain (#14458) Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com> * Automatic changelog generation #14458 [ci skip] * remove one space (#14472) I think it might fix everything, if it does then holy shit I want HC * Automatic changelog generation #14472 [ci skip] * Ports holosigns from bay (#14479) * prot old baycode is pain * mapping * forgot to push this * Automatic changelog generation #14479 [ci skip] * frenzy now provides reduced damage slowdown since it also provides a constant source of damage (#14480) * Automatic changelog generation #14480 [ci skip] * Update ai_data_core.dm (#14504) * Automatic changelog generation #14504 [ci skip] * Adds new Chemical Analyzer implant (Science Goggle implant) (#14488) * Update augments_eyes.dm * coding is happening... * Makes sci implant work * rename implant to reflect lack of research value scanner * Automatic changelog generation #14488 [ci skip] * Automatic changelog compile [ci skip] * Automatic changelog compile [ci skip] * Kilo roboticists get anesthesia (#14515) * Automatic changelog generation #14515 [ci skip] * Fixes improper secbelt/bandolier item storage (#14522) * i love storage * Update code/game/objects/items/storage/belt.dm Co-authored-by: Theos <theubernyan@gmail.com> Co-authored-by: Theos <theubernyan@gmail.com> * Automatic changelog generation #14522 [ci skip] * Update dependencies.sh * Update dependencies.sh * Automatic changelog compile [ci skip] * Batons are now Upgradeable - 1 Hit Stun - Minshield Firing Pin (#14306) * Batons V2 * Fuck off bibby * e * OR now * fixes status * e * e * Fixes batons not hitting people with implant check * Apply suggestions from code review Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> * Automatic changelog generation #14306 [ci skip] * Balances Stimulants (#14463) * Automatic changelog generation #14463 [ci skip] * Fixes Baton Upgrade * nerf DU slugs, but make them cheaper (#14473) * nerf DU slugs, but make them cheaper 2 less uranium sheets each, AP under 100 but still absurdly high, lower damage to go with them being slightly less expensive * bump damage back up a little * tweak values on cost and damage * Update shotgun.dm * Automatic changelog generation #14473 [ci skip] * buffs the bulldog shotgun because it kind of stinks (#14475) * Update shotgun.dm * Update shotgun.dm * Update shotgun.dm * Automatic changelog generation #14475 [ci skip] * makes space bats holdable (#14484) * b * oop * Automatic changelog generation #14484 [ci skip] * Chemical Dispensers now have a reason to upgrade manipulators (#14495) * makes chem disp manip upg worth * removes macro text for being useless * Automatic changelog generation #14495 [ci skip] * Adds Brain Damage Quirk (#14497) * Life changing shuttle ride * bump point value * 2nd person * Bumps value to -7 because uncurable trauma that could be ultra shitty * Automatic changelog generation #14497 [ci skip] * Update overmind.dm (#14501) * Automatic changelog generation #14501 [ci skip] * fixes health doll being on top of stop pulling button for simplemob (#14502) * Update _defines.dm * Update _defines.dm * Automatic changelog generation #14502 [ci skip] * Adds FTL Theme to Lobby Music (#14505) * Update ticker.dm * Update ticker.dm * Automatic changelog generation #14505 [ci skip] * Fixes (#14507) * Automatic changelog generation #14507 [ci skip] * Rotate (#14510) * Automatic changelog generation #14510 [ci skip] * Adds the horror's host to check antags (#14511) * Automatic changelog generation #14511 [ci skip] * Update blazing_oil.dm (#14513) blazing oil takes less extinguish damage * Automatic changelog generation #14513 [ci skip] * sabo borgs have emags now what (#14517) * Update robot_modules.dm * , * Automatic changelog generation #14517 [ci skip] * Adds FTL Advanced Edition Soundtrack: Lanius (Battle) (ABANDONED SECTOR) (#14506) * Adds FTL Advanced Edition Soundtrack: Lanius (Battle) (ABANDONED SECTOR) * Update ticker.dm * Automatic changelog generation #14506 [ci skip] * Update items.dm (#14519) * Automatic changelog generation #14519 [ci skip] * Update ghost_role_spawners.dm (#14520) * Automatic changelog generation #14520 [ci skip] * z (#14494) * Automatic changelog generation #14494 [ci skip] * Saboteur/Medical Syndicate Borg Tweaks (#14521) * stab stab stab * oopsie doopsie removes emag for now might adjust again when i get a better idea * Automatic changelog generation #14521 [ci skip] * Revert "sabo borgs have emags now what (#14517)" (#14546) This reverts commit 6a2f14f. * Makes WT mags not be invisible anymore (#14529) * Automatic changelog generation #14529 [ci skip] * Automatic changelog compile [ci skip] * capitialism is no longer 1m+ long (#14532) * Automatic changelog generation #14532 [ci skip] * Automatic changelog compile [ci skip] * theos (#14564) * Automatic changelog generation #14564 [ci skip] * Automatic changelog compile [ci skip] * adds grounding rods to delta (#14557) * Automatic changelog generation #14557 [ci skip] * Automatic changelog compile [ci skip] * fixes bloody knuckles not splashing when used by undead races and also marking the user with one of the abilities (#14575) * whoops * Update necropolis_chests.dm * Automatic changelog generation #14575 [ci skip] * Automatic changelog compile [ci skip] * Automatic changelog compile [ci skip] * Fixes box engineering wires and signage and light (#14567) * fix * wires * Automatic changelog generation #14567 [ci skip] * Automatic changelog compile [ci skip] * Automatic changelog compile [ci skip] * print via RSF and also fixes designs (#14597) * Automatic changelog generation #14597 [ci skip] * fixes new ticket being created every time admin pm (#14596) * SHARPENS YE PIRATE BLADE (#14538) * AVAST YE SCURVY DOGS * PLURALS THE WORD REFERENCING THE WEAK AND MEEK Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> * Update misc.dm Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> * Automatic changelog generation #14538 [ci skip] * Ability to set beer code separate of real nuke (#14527) * Automatic changelog generation #14527 [ci skip] * Disabling Regal Rat till its fixed (#14437) * Update mouse.dm * fuck off * Automatic changelog generation #14437 [ci skip] * Nukies Minigun is now more... Minigun-like (#14446) * BRRRRRRRRT * Update code/modules/projectiles/guns/ballistic/minigun.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * Update code/modules/projectiles/guns/ballistic/minigun.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * Update code/modules/projectiles/guns/ballistic/minigun.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * Update code/modules/projectiles/guns/ballistic/minigun.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * Update code/modules/projectiles/guns/ballistic/minigun.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * Update minigun.dm * nerfs fun * spread reduction Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> Co-authored-by: Theos <theubernyan@gmail.com> * Automatic changelog generation #14446 [ci skip] * Adds winter coats for department heads (#14468) * Adds winter coats for department heads * Update miscellaneous.dm * Update miscellaneous.dm * inhand sprites * AAAAAAAAAA * merge conflicts gone at last * Automatic changelog generation #14468 [ci skip] * Ports "bigger mobs have some special health bars" from TG (#14492) * Update computer.dm * Update meat.dm * Update objects.dm * Update computer.dm * Update meat.dm * Update objects.dm * Фыы * Alah * sus * Automatic changelog generation #14492 [ci skip] * Ports "Blobbernaut HUD improvements" (#14499) * Update computer.dm * Update meat.dm * Update objects.dm * Update computer.dm * Update meat.dm * Update objects.dm * Blobberhud * Ass * Automatic changelog generation #14499 [ci skip] * Ports "Swarmer HUD improvements" (#14500) * Update computer.dm * Update meat.dm * Update objects.dm * Update computer.dm * Update meat.dm * Update objects.dm * swarmerhud * Automatic changelog generation #14500 [ci skip] * should stop resonator blasts from stacking during replication (#14526) * Automatic changelog generation #14526 [ci skip] * Update pen.dm (#14535) * money (#14539) * Automatic changelog generation #14539 [ci skip] * Stunn't (#14540) * Automatic changelog generation #14540 [ci skip] * guh?? (#14543) * Automatic changelog generation #14543 [ci skip] * Rune Scimmy rework: Now with 100% more grinding and bonus loot (#14547) * i think it's ready * wording * Automatic changelog generation #14547 [ci skip] * Temperaraly reverts cryopod changes till I can find out whats wrong (#14548) * temp revert * Revert "temp revert" This reverts commit fda027b. * pain * pain * Automatic changelog generation #14548 [ci skip] * Explody nanite changes (this wasn't my idea don't yell at me) (#14550) * Cowbot-requested changes * Update code/modules/research/nanites/nanite_programs/weapon.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * oops i forgot this Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * Automatic changelog generation #14550 [ci skip] * Adds stun immune and moves it lower (#14553) * Automatic changelog generation #14553 [ci skip] * fake death 3.5 to 4.5 UR (#14554) * Automatic changelog generation #14554 [ci skip] * Krav Maga Nerfs (#14541) * Krav Maga Nerfs * capital K * Update code/datums/martial/krav_maga.dm Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com> * Automatic changelog generation #14541 [ci skip] * SMES Visual Update (#14509) * Visual Update * Lighten internal outlines * Update power.dmi * Automatic changelog generation #14509 [ci skip] * Update uplink_items.dm (#14556) * Automatic changelog generation #14556 [ci skip] * mm bone sword... (#14561) * Automatic changelog generation #14561 [ci skip] * Adds new cargo loan event: PETA (#14562) * PETA * Vibe check * Automatic changelog generation #14562 [ci skip] * Two new ammo types for traitors/nukies(?) (#14563) * most stuff except sprites * Sprites for unique shell, non unique drums * Automatic changelog generation #14563 [ci skip] * adds ventriloquist dummy to autodrobe (#14565) * Automatic changelog generation #14565 [ci skip] * Update blood_magic.dm (#14566) * Automatic changelog generation #14566 [ci skip] * Shows all chemicals in the chem machine you could dispense if fully upgraded (just read the PR) (#14574) * yes * poop * Update chem_dispenser.dm * Automatic changelog generation #14574 [ci skip] * Update utility_closets.dm (#14577) * Automatic changelog generation #14577 [ci skip] * adds a sound when cooking finishes (#14580) * Automatic changelog generation #14580 [ci skip] * The Golden Age of Piracy (#14583) * Automatic changelog generation #14583 [ci skip] * Update medical_designs.dm (#14586) * Automatic changelog generation #14586 [ci skip] * Surgical tweaks (#14589) * a * final touches * makeshift tool surgery * Automatic changelog generation #14589 [ci skip] * Automatic changelog compile [ci skip] * gives the advanced hardsuit full rad protection (#14592) * Automatic changelog generation #14592 [ci skip] * replaces ghostrole/vr dispensers with fullupgrade (#14593) * Automatic changelog generation #14593 [ci skip] * Blinking with bluespace crystals is 233% more unpleasant (#14579) * Le Change * Apply suggestions from code review Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com> * Automatic changelog generation #14579 [ci skip] * Shadowlings now cannot get mutations and nerfs speed (#14560) * Nerf * Makes Less Cringe * Automatic changelog generation #14560 [ci skip] * Automatic changelog compile [ci skip] * Item_color removal and different mob handcuff sprites ports (#14395) * spritesheets port Ports sprite sheets to also have support for multiple/modular clothing files, which I will probably also port. * pain * fix * fix * Revert "fix" This reverts commit 5e11310. * Revert sprite sheet stuff * fixed the revert * merge fix * checks * checks x2 * fixes some belts * initial fixes * a * accessories * a * robo labcoat fix * Automatic changelog generation #14395 [ci skip] * Automatic changelog compile [ci skip] * Fix whale (#14615) * Fixes whale spawning * Forgot to add bugfixes * Adds map change (maybe) * Automatic changelog generation #14615 [ci skip] * Automatic changelog compile [ci skip] * Hand Drill in screwdriver mode is now pointy (#14609) * Makes the hand drill pointy * Blunt Wrench * Automatic changelog generation #14609 [ci skip] * Automatic changelog compile [ci skip] * Research now requires Toxins/Robotics Access with Doors (#14559) * Fixes * Map * Emag * I dont know how to code * Glass * Update code/modules/research/rdconsole.dm Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> * Fixes shitty code Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> * Automatic changelog generation #14559 [ci skip] * e Co-authored-by: ynot01 <ynot000001@gmail.com> Co-authored-by: Yogbot-13 <admin@yogstation.net> Co-authored-by: Byemoh <baiomurang@gmail.com> Co-authored-by: Chubbygummibear <46236974+Chubbygummibear@users.noreply.github.com> Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com> Co-authored-by: ChesterTheCheesy <71487903+ChesterTheCheesy@users.noreply.github.com> Co-authored-by: AlvCyktor <81328245+AlvCyktor@users.noreply.github.com> Co-authored-by: Changelogs <action@github.com> Co-authored-by: Theos <theubernyan@gmail.com> Co-authored-by: Vaelophis Nyx <1534478+GalacticRuler@users.noreply.github.com> Co-authored-by: nmajask <nmajask@gmail.com> Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Co-authored-by: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com> Co-authored-by: Hopekz <hopekxx@gmail.com> Co-authored-by: LazennG <58535870+LazennG@users.noreply.github.com> Co-authored-by: jachlompsky <74697056+jachlompsky@users.noreply.github.com> Co-authored-by: 00ze-cyclone <96987868+00ze-cyclone@users.noreply.github.com> Co-authored-by: GraveHat <107460718+GraveHat@users.noreply.github.com> Co-authored-by: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Co-authored-by: Redmoogle <dakotamew@gmail.com> Co-authored-by: stwordcitizen <84217619+stwordcitizen@users.noreply.github.com> Co-authored-by: adamsong <adamsong@users.noreply.github.com> Co-authored-by: Marmio64 <60946370+Marmio64@users.noreply.github.com> Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> Co-authored-by: Manatee <74586965+MajManatee@users.noreply.github.com> Co-authored-by: SapphicOverload <93578146+SapphicOverload@users.noreply.github.com> Co-authored-by: Mqiib <43766432+Mqiib@users.noreply.github.com> Co-authored-by: Sniblet <36427443+Sniblet@users.noreply.github.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 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.
Document the changes in your pull request
Ports "Give mood buff for defibbing someone" from TgStation.
Changelog
🆑 Mothblocks, ported to YogStation by SuperSlayer
rscadd: Defibing people now gives positive mood
/:cl: