* Engineering ERT members get power tools (#56589)
Engi ERT now get power tools, upgraded RCDs, and a rapid pipe dispenser.
* Engineering ERT members get power tools
Co-authored-by: NotRanged <rangedvdk@gmail.com>
* Moves grown food to newfood (#55040)
Moves grown food to newfood
Gives trash element support for callbacks for item creation override
* Moves grown food to newfood
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
* moves misc food to newfood code (#54788)
misc food is now using newfood code
* moves misc food to newfood code
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
* Re-assesses 99% of vending prices through Arconomics to match player resources and round-length. (#54715)
* The Re-pricening
* Rewritten and adjusted for paycheck defines.
* I made the map changes finally.
* And the refills too.
* "OH YEAH REPLACING IT ALL WITH DEFINES AND SCALING IT THE EXCEL DOCUMENT WILL BE EASY, ARCANE!!!"
* And the premium ones too.
* Accidently spoiled a future pr due to dme bleedover
* Re-assesses 99% of vending prices through Arconomics to match player resources and round-length.
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
* s-s-s-spaghetti to newfood (#53574)
🆑 Qustinnus
code: Moves spaghetti to new food
fix: Fixes some more size problems on food
fix: Fixes organs having wrong params
/🆑fixes#53482fixes#53572
* s-s-s-spaghetti to newfood
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
* Medical belt/medical aid kit consistency updates (#53442)
Lets the new blood filter tool be put in medical belts/medical aid kits since those are supposed to hold surgery tools
Lets spray bottles, amputation shears, and surgical tape be put in medical aid kits since it's supposed to hold the same stuff as the medical belt (I didn't add the plumbing stuff to medical aid kits though since chemists don't get them)
Removes bio bag and chem bag from the medical first aid kit since they're too big to go in there anyway
Adds blood filter mode to the debug omnitool since it's supposed to have a mode for every tool define
* Medical belt/medical aid kit consistency updates
Co-authored-by: Tony <19880843+AdmiralPancakes1@users.noreply.github.com>
* Utility belts can now hold airlock and decal painters. (#53027)
* Utility belts can now hold airlock and decal painters.
Co-authored-by: uomo <51800976+uomo91@users.noreply.github.com>
* Adds floral somatoray to botany belt (#53010)
Makes it so you can store the floral somatoray in the botany belt
* Adds floral somatoray to botany belt
Co-authored-by: Bampotio <69210247+Bampotio@users.noreply.github.com>
* Personalized combat messages part 2 (#52890)
Adds more "personalized" combat messages for all participants in a fight: the attacker, the victim and the spectators
* Personalized combat messages part 2
* Update misc.dm
Co-authored-by: kingofkosmos <riki.sundberg@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
* pierce the heavens
* starts doing projs
* continue pierce
* before armor
* before sharpness redefine
* rename sharp defines, before further implementation
* finishing undoing atk_type back to sharpness
* neatens up sharpness defines, FALSE -> SHARP_NONE
* more piercing, removes brute damage bleed, bubblegum no longer wound
* starts letting embeds get in on the fun
* half with embed
* work on dismembering
* continued embed work
* more moving bandaging to limbs
* more dismemberment work
* removing embed pierce stuff
* tweaking bullets
* more docs and work on dismemberment
* spans, piercing, guns
* dismemberment and scar fixes
* bee changes
* bullets embedding
* more bullet and dismember work
* dismemberment, surgery, piercing, formaldehyde,
* pleases travis
* pierce smite
* nicer on blood
* Auto stash before rebase of "tgstation/master"
* more neatening
* wounds only consider up to 35 damage, wounds on l6 and 762
* updates hulk
* balance
* defines
* lower slug to 50 brute to accommodate wounds
* adds differentiation for having flesh/bones/both in mobs
* moves scar descs to json, renames organic_state
* excises removed healing skill
* fixes logs, inconsistencies, some balance changes
* untab
* slight compress
* a
* kills pointed global list
* dmdoc
* halfway through roh
* finishes roh review
* okay NOW i finished roh's reviews
* roh roh roh your boat
* gently down the stream
* global lists
* list ops, fix scanner for bone gel improvised fix
* travis moment
* sounds added and moved
* pellet clouds can join the fun fully, slight gun balancing for wounds
* doc moment
* unconflicts myself
* update hulk
* Update code/_onclick/item_attack.dm
Co-authored-by: Rohesie <rohesie@gmail.com>
* crying ascii face
* final rohview
* oops
* final final
Co-authored-by: Rohesie <rohesie@gmail.com>
About The Pull Request
This PR adds medical wounds, new forms of injuries that people can suffer that cause debilitation and complications, and often require more than what can be found in a medkit to treat. But let's be honest, big complicated walls of text about medical changes make people's eyes glaze over easily- so I created a handy infograph to explain the basics!
Also there's a full guide here!
dreamseeker_2020-04-18_20-42-19.png
The infograph may not be fully up to date with the specifics of the PR's status, but it'll be updated along with major changes so people have something to use as a crash course for familiarizing themselves with how wounds function. I also have another infograph with all 9 of the possible initial wounds coming, and will be up soon. You can also find the longform design doc here with more info on the broad details, including descriptions of treatments: hackmd whee
What this does
There's a lot to cover, but here's the bullet points of the main features and changes:
Getting lots of damage on a limb can result in wounds, with more damage causing worse wounds. These can range from dislocated joints and minor cuts to compound fractures and fourth degree burns, and can affect you in different ways depending on what bodypart they're applied to (namely with broken bones).
You can damage individual bodyparts on clothing (only jumpsuits for now) through the use of lasers and sharp weapons. Bodyparts that reach max damage are considered "shredded" and will not apply any protection for that zone until it is repaired with cloth. If all zones are disabled, the entire piece of clothing is shredded and unwearable until repaired with 3 cloth. Jumpsuits give a small amount of wound protection, and since sharp weapons and lasers generally get extra wound bonuses against bare flesh, even a plain jumpsuit provides decent protection from a few laser shots or scalpel stabs.
Lasers gain a powerful niche versus unarmored/lightly armored carbons! As noted above, lasers can shred clothing and burn away zones of jumpsuits in 2 shots each, after which the target's bare flesh is exposed (barring other clothing), and lasers excel at dealing burn wounds against uncovered skin. Think big, nasty charring!
Bleeding is now totally limb based, and gauze is as well. Bleeding is also 95% cut wound based, meaning sharp weapons make you bleed rather than just having 40+ brute on a limb.
The more wounds and damage you get on a bodypart, the easier it'll be to gain more severe wounds. Wounds are arranged from Moderate, to Severe, to Critical in increasing severity, and you'll generally have to suffer the lesser ones before getting the worse ones.
dreamseeker_2020-05-15_03-15-59.png
Above: Someone having an incredibly bad day from bloodloss
dreamseeker_2020-05-04_22-29-29.png
Above: Scars from healed wounds
ShareX_2020-05-15_06-55-20.png
Above: Actual combat involving someone's head getting cracked
Here's a quick, if non-exhaustive, list of things I have left to do before I consider it feature complete
Finish adding treatments for each wound type/severity (mostly surgeries/triage for critical wounds)
Add second winds for bad injuries to give the victim a chance to get away
Flesh out severe & critical injuries in general
Find sprites for the bonesetter, bone gel, and anything else that might be needed
Add the medical items for treating the less severe wounds to the station
Polish code and remove any redundancies I left behind
Quick balance pass to make sure nothing is horribly abuseable
Why It's Good For The Game
Adds a flexible new system for representing damage on carbons with injuries that can be treated in different ways. Moderate wounds from getting toolboxed or sliced with a scalpel can usually be treated by a buddy or even by yourself with the right tools, but getting flayed with a fireaxe or a laser gun emptied into your bare skin may require extra attention or even surgery in bad cases! Also makes laser guns cooler and more like 40k lasguns that can flash fry people (cool!)
This should also make spessmen more resilient and harder to kill outright, while still adding consequences and complications to getting hurt. Wounds aren't immediately fatal, but they can do things like slow down interactions, deal damage over time through infections, and generally make you more fragile until fixed. They can also give you a "second wind" on being applied that gives you a small adrenaline boost (or whatever) to help disengage and escape immediate danger.
Changelog
🆑 Ryll/Shaps
add: Introduces medical wounds, new injuries that can happen to fleshy carbons when they sustain lots of damage on a bodypart. There's quite a lot of change here, but you can read the guide at: https://tgstation13.org/wiki/Guide_to_wounds and an extended changelog is available here: https://hackmd.io/l_FI9b3tSqa_woDadewJXA
add: Introduces scars and temporal scarring! Healing a wound leaves a scar behind that can be seen by examining someone twice rapidly, and if Temporal Scarring is enabled in character prefs, surviving a round with scars will save them to be granted at roundstart another round! Let your body tell stories!
tweak: Bleeding is now fully bodypart-focused, and 95% of bleeding comes from cut wounds from sharp weapons. Gauze is applied on a limb-by-limb basis, and helps staunch bloodflow rather than totally stop it. Notably, you no longer bleed just from having 40+ brute damage on a limb.
del: Organic bodyparts are no longer disabled at maximum damage, but are easier to cause wounds to
add: O2 medkits in emergency lockers have been replaced with new emergency medkits with basic tools for diagnosing and treating wounds and basic damage
tweak: Herapin now rapidly increases bleeding on all open cuts, rather than causing bleeding by itself. The more cuts on the target, the more it will affect them.
tweak: Neckgrab table slams now hit the targeted limb rather than just the head, with a large chance to dislocate or break a bone
tweak: Sharp weapons and burning weapons can now shred zones on jumpsuits, disabling protection on that limb. Damaged clothes can be repaired with cloth.
tweak: Slaughter demons now deal less raw damage, but gain the ability to cause cut wounds, which becomes more powerful with each attack on a humanoid but resets when bloodcrawling.
/🆑
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.
* Fixes some comments
* Fixes map issue
* Restart lints
* Properly resolves conflicts
* EVERYTHING. Check the changelog.
* Minor species change, spade fits on plant belt.
* Local man blind, news at 11.
* Longrange pollenation, and fixes pill composting.
About The Pull Request
It annoyed me that we have a perfectly good frag grenade item, and a perfectly good shrapnel component, but no crossover episode between the two. This remedies that, and does a lot, lot more.
dreamseeker_2020-03-30_05-01-13.png
dreamseeker_2020-03-30_05-01-26.png
Big points:
Adds new component: pellet_cloud, which can be used by ammo casings, guns, and landmines to spray shrapnel and display aggregate hit messages ("You're hit by 6 buckshot pellets!" vs "You're hit by the buckshot pellet in the X" x6). All gun ammo that shoot multiple pellets now use this component on firing.
Adds stingbangs, premium less-lethal grenades that shoot off lots of stinger pellets, to cargo. Frag grenades are also reworked to have smaller booms, but shoot off lots of shrapnel shards. You can jump on top of these grenades to absorb a portion of the shrapnel to save those around you! There's an achievement for dying this way, called "Look Out, Sir!"
Projectiles can now embed items/shrapnel. Adds .38 DumDum ammo to cargo that does less damage and has negative armor pen, but can embed in people. This is the only ammo that currently embeds.
Bullets can now ricochet off walls, structures, and machinery (harder surfaces are more likely to ricochet). Only standard .38 and Match Grade .38/.357/L6 ammo can ricochet, with Match Grade being much better at ricocheting. You can buy Match Grade .38 from cargo and Match Grade L6 ammo from the nuke uplink, while Match .357 is admin only.
Armor now protects you from harmful embeds, taking the better of the bullet/bomb armor on the affected limb. Armor penetration can modify this of course, and many blunt embeds like stingbangs and DumDum bullets are significantly worse if you have even 1 armor.
Other misc fixes/changes
Refactored the embed element a bunch and fixed it creating new elements for every instance rather than expected bespoke behavior. There are new /obj/item helpers for modifying and adding embedding.
Fixes#49989: Spears can no longer embed in turfs cause their sprite is annoying to me, it's generally harder for most things to embed in turfs
Fixes#49741: New carbon helpers for removing embedded objects
Fixes#46416: Handles embedded objects getting qdel'd or moved while embedded
Renamed the old shrapnel component for RPG loot to MIRV to avoid confusion
Repathed frag grenades from under minibombs to under base grenades, and added explosion vars to base grenades
Why It's Good For The Game
Fixes a bunch of janky design with embeds, adds lots of new avenues for projectile and grenade variety, ricochets and collateral damage are fun!
Changelog
🆑 Ryll/Shaps
add: Adds stingbangs to cargo (and one in the sec vendor premium), premium less-lethal grenades that shoot off a giant swarm of stingball pellets to help incapacitate swarms of people in tight quarters. You can jump on top of a live one to be a hero and absorb a bunch of shrapnel, same with frag grenades. There's even an achievement for dying to a grenade you jumped on!
add: Projectiles can now embed in people! Or at least grenade shrapnel and the new .38 DumDum ammo, now available in cargo, can. DumDum rounds excel against unarmored targets, but are pricey and do poorly against armored targets.
add: Bullets can now ricochet! Or at least, standard .38 and the new .38/L6 Match Grade ammo can. Match Grade ammo is finely tuned to ricochet easier and seek targets off bounces better, and can be purchased from cargo (for the .38) or nuke ops uplink (for the L6), but standard .38 ammo has a chance to ricochet as well.
tweak: Frag grenades now have smaller explosions but shoot off a bunch of devastating shrapnel, excellent for soft targets!
tweak: Shotguns and other multi-pellet guns now print aggregate messages, so you'll get one "You've been hit by 6 buckshot pellets!" rather than 6 "You've been hit by the buckshot pellet in the X!" messages. Bye bye lag!
balance: Armor can now protect against embedding weapons, taking the best of either the bullet or bomb armor for the limb in question away from the embed chance. Some weapons are better at piercing armor than others!
/🆑
About The Pull Request
For an item to be two handed just add this handy component.
All existing two handed items have been converted to use this component.
Why It's Good For The Game
It has components and signals, and now you can make items two handed so simply.
/obj/item/shockpaddles/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed)
It's a broom
The basic janitorial tool that's been missing for all these years
Demo here: https://www.youtube.com/watch?v=KHcEIhAxx0g🆑
add: Added the broom. For sweeping.
/🆑
* Buffs the gygax, give some more support items for mechs in general since there isn't a need for a dedicated ammo bag for the gygax
* Wrong cell
* Fixed some stuff.
* I fucked up the wrench inhand good and proper yikes I am a dumb cat
* gave some inhands for the inducers
* Hopefully this adds the overlays for the wrench.
* Someone helped me make a much better wrench sprite after several failed attempts on my part due two tones being hard to make definable shapes with!
* adds rideable goliaths
* stamding on the emdge
* plems work
* this should be it
* FUCK YOU TRAVIS
* primal friendly
* ok athath buddy
* mmm grayons
* sprite gang
* placeholder sprite, works till someone makes a new one maybe haha
* lets do this
* An object tames a monstrous beast somehow. More news at 5.
* update_icon() improvements
Fixes some update_icon() calls to properly call parent and use update_overlays() and update_icon_state().
The rest of obj/item fuck it
* Suggested fixes, also passes the linter
* I always forget . = ..() is faster than return ..() FOR SOME FUCKING REASON
* Actually this is better
* Signilzes datum/action to update its icon when its connected item does.
Adds a new emergency response team, the ERP! It stands for Emergency Response Party
the ERP includes:
-the coordinator: basically the captain of the operation, armed with a birthday cake, balloon and lots of fireworks to start the celebration
-the bouncer: the big boy, has a telebaton and an armor vest (if youre a loser you get a police hat too)
-the constructor: has tools, materials to build the party, disco tiles and an ethereal disco ball planter
-the cleaning service: your normal jannie, with his trusty mop, trash bag and cleaning grenades
-the comedian: a clown, armed with instruments, a bananium shield and chameleon suit/hat, for some comedy at the party
* Adds a new job: EMT
* adds code
* either adds or removes code, hard to tell at this point
* Never not on it, leanin' so hard you're ashamed
You can't dismiss this sick transmission, huffs your brain
Exhale your will and forget I ever knew you
Fuck do you do?
Fuck a man with hips for hulu
Rack a snitch, chalk and cue you
Corner pocket consume you
Too many hoes in my
Too many hoes in my motherfuckin' meal
Asking if I know how a motherfucker feels
How a motherfucker feels
* 300 hours in MS Paint
* map editing is almost as pleasant as CBT
* remove crepe
* indentation
* map merge
* crew pinpointer, EVA access
* sick sprites by twaticus
* Replaces pen acid bottle with calomel
* Moves crew monitor/pinpointer to premium
* Triple six, five, forked tongue
Subatomic penetration rapid fire through your skull
How I shot it on one taking it back to the days of trying to lose control
Swerving in a blaze of fire, raging through my bones
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah, I feel like killing it Takyon
Alright that's tight, what its like to experience Takyon
Out of the blue, in through the back
Door coming through like fuck what was that
Man I don't know, but it made me feel so heated
How we creep without showing you jack
Shit from below, give a shit if you know
'cause even if you did, you'd keep coming back
Back for more, need it man you're addicted to the heat
We make beats catch
Beat it til it bleeds to death, each track
Like EPMD snappin' necks as we tap energy
From everything on and off the map
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
Takyon, shot down your throat like a keg of beer
Choke on the smoke we in and exhale 'til the whole chamber is clear
Haters act so fucking weird
Try to stain this atmosphere
But they can't 'cause its way too sheer
How to make a hater disappear
Take shit where it ain't never been
Fuck what you thought could not comprehend
This shit if I fisted your brain with it
10-9-8-7-triple 6-5-forked tongue
Criminal level crunk lightning storm
Get out the way or get up torn
Ain't a picture big enough to fit
What we dig up from the core
Of all that they forgot ever was
Militant march of this war
Takyon taking them down
All we see is blood
Takyon turning them out
How to trick out and freak that buzz
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
Lunar eclipse forcing you to trip
Off the moonlit fire we spray
Cryonic haunted bullets hollow tipped with toxic waste
So here's the deal, if you don't feel ill
Don't want it nowhere near my zone
That shit is dead, can't nobody get
With that shit gets dial toned
Takyon bitch slappin pussy clots and clones
Takyon settin' off uni bombs inside your dome
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
* YUH
* Updates sprites
* changes job order, uncomments plasmeme clothes
* Updates outfits
* last commit I swear
* bottle descriptions
* Renames EMT to paramedic
* Renames existing EMT clothes to paramedic as well
* Add missing job icons for Paramedic (#9)
SecHUD icon
ID card icon
* Improves descriptions
* Reverts vending balance change, replaces random spaces with tabs
* Resolves map conflicts
* Update strings/ion_laws.json
Co-Authored-By: BadSS13Player <58376109+BadSS13Player@users.noreply.github.com>
* Adds missing pda_slot to the paramedic outfit
* roller bed starting equipment
* Fixes map conflict
Co-authored-by: JJRcop <jrubcop@gmail.com>
Co-authored-by: BadSS13Player <58376109+BadSS13Player@users.noreply.github.com>
* prices & income
* more prices
* lower megaseed premium prices
* custom prices for premium tools
* slightly lowers prices for some snacks/drinks/cigs
* hey get back here
