After seeing a whole lot of complaints about burn patches only containing 1u of Aiuri, I decided to do an amazing whole 1-line change bringing the burn patches in line with the brute patches. (both contain 2u now of their respective chem)
* Case of lower
* More changes
* Ruins the nice 420 diff, brainfart when doing the second batch of conversions
* More changes
* Next batch. I think
* Converts even more paths
* Restarts bots
* Capital Free Zone
* Come on travis, do something
* Renames areas
* Bots, please stop dying
* Updates CONTRIBUTING.md and updates a few paths I missed.
* APC recgarftzfvas
/obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
* 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
* adjusts medigels to spray round numbers, buffs patches to be equivalent to a 10u spray, warns of instashdfghsdf's toxicity on the bottle/patch
* not today, patches
About The Pull Request
Buffs C2 Healing
I should have leaned to more healing initially, especially since they're damaging. Goal here is to make them more enticing.
Dilutes Starting Meds / Borg Hydro Microdosing
Perhaps this was the biggest issue in that your DEFAULTS carried way too much of the chem specifically designed for lower dosages so people were getting smacked with needless damage consistently.
You can still make your own "pure" samples I guess, but I think you'll like the current values.
Borgs can now switch between 5u/2u with altclick.
Adds a C3 Diluent Specifically for Minor Brute/Burn
Wouldn't make much sense to dilute it with air! Granibitaluri is a new C3 that slowly tops off your damage by order of brute then burn. The catch is you must be at 10 damage or less for the healing to apply. ODs at 50.
This is the reagent all C2s are diluted with regardless of what they heal (meaning brute/burn chems will heal a tad better but only when you're about healed anyways).
Why It's Good For The Game
Buffed C2s to make them more viable as contenders to some of the more oddity avenues you guys were using.
Dilutes C2s to make the roundstart items viable on their own without chemistry (or at least a chem master). Same with Borg Microdosing option.
Added the C3 since it was suggested by zxaber to have a form of healing more minor damage without going through the lengths of surgery.
Sorry in advance silicon players, the solutions are still pure in your hypo!
Changelog
cl Anarcho-Capitalistabital-by
add: In General, Buffs healing thoroughput of C2s. You can stop paying your cloners overtime now!
tweak: The roundstart C2 methods are now diluted with a new reagent, Granibitaluri.
tweak: The borghypo now can switch to "microdosing", which is 2u transfer via AltClick
add: Granibitaluri is a C3 (no downside!!!) that tops off your brute THEN burn damage if they are at or below 10 damage.
/cl
Thank you guys for being so patient and providing constructive feedback! G-g-g-good thing coders "play" haha!
* 150 hours
* it compiles guys
* PERF
* meta conflictor
* oldcabin
* Revert "meta conflictor"
This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.
* oldmeta
* TAKE 5000
* NAME THIS
Also redoes Multiver/Palletta
* FRICK U FIZ
* NERF PERF
* comment cringe
* Checks for restraints/incapacitated for ichiyuri
* URIKA
Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.
* organ
* please upvote this
* maps...
* Gives Instabitaluri a Brand Name
Oh wow it's synthflesh 😆
* Update cat2_medicine_reagents.dm
* what kinda characters is Krys using
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
* adds signal and modifies each call of afterattack to call it's inherited proc
* uses new macro for sendsignal()
* map fuck
* skip precommithooks
* combine and negate 2 ifs
* Gets rid of the 8 patches in the vendor.
* Removes the brute pillbottles from miner gear, replaces with survival medipen.
At the behest of the design lead. New brute patches were ineffectual and giving them a bunch ruins the single get out of injury free card they used to have.
Goof was supposed to do this in his pr but he never did. He approves of this change though.
Patches now only hold 40u. This is 1:1 with goon and makes them less of a direct upgrade from pills with a tiny delay.
Medkit patches now only hold 20u by default. As they are now, patches will heal you to full health with like one or two. That means a medkit is more useful than a doctor. This fixes that and is also 1:1 with goon.
- TOUCH no longer transfer reagent by default, it's now only used for touch based effect like being flammable when touched by fuel or you and your stuff being acided when touched by acid).
- PATCH does no transfer of its own (but actual patches code do make a transfer) but is used for touch effect that ignore clothes and protection (blob attacks, patches effect going through hardsuits)
- VAPOR does reagent transfer but it takes into account clothing protection
Fixes a typo in humanoid/get_permeability_prot
Fixes acid splashing on objects not destroying it. Fixes acid splashing on turf not destroying objects on the turf.
Changed damp rag smothering code a bit.
Blob Smoke now doesn't do anything.
Remove alloweat var from masks, remove MASKCOVERSMOUTH flag from mime and clown masks so you can still eat through them.
Some adjustments in surgery checks for bodyparts covered.
Fixes a runtime in weapon/energy attack_verb.
Humans can now CPR monkeys.
Slight changes to CPR code.
Fixes runtime with drones trying to do CPR.
Rewrites /obj/item/weapon/reagent_containers/proc/canconsume to be less shitty.
Adds an is_mouth_covered() proc to carbons to check for mask and headgear with MASKCOVERSMOUTH or HEADCOVERSMOUTH, with argument to restrict the check to only mask or only head.
12x syringe
10x styptic patch
10x silver sulf patch
4x charcoal bottle
4x epinephrine bottle
4x morphine bottle
4x diphen bottle
3x potassium iodide bottle
5x salglu bottle
3x atropine bottle
6x spaceacillin syringe
10x calomel syringe
10x salbu pill
10x mannitol pill
5x mutadone pill
4x health analyzer
2x crew monitor
CONTRABAND:
all of the same except with 3 bottles of toxin
the two types of wallmed have been combined into one wallmed, which contains all of the above except halved. in instances where the number was odd, the higher of the two numbers was taken.
medical closet has been stocked with a lot of new stuff.
2x beakers
2x droppers
1x medical belt
1x syringe box
1x toxin bottle
2x morphine bottles
3x epi bottles
3x charcoal bottles
1x rxglasses box
this, of course, 3 new pills and 3 new bottles in code so they could be in the nanomed.
gives genetics a bottle of mutadone pills on box and eff3 and puts a public bottle of epinephrine on the medbay desk. adds a single syringe to boxstation's medical storage.
medkits now have some new equipment.
normal
2x styptic patch
2x sulf patch
1x salicyclic pill
1x health analyzer
fire
4x silver sulf patches
1x health analyzer
1x epipen
1x salicyclic pill
toxin is unchanged
oxygen
4x salbu pills
2x epipen
1x health analyzer
all maps and z levels are updated for this.
renames styptic patch to brute patch and silver sulf patch to burn patch. renames charcoal bottle to antitoxin bottle
adds myself to admins.txt
Adds epipen as per request by @quiltyquilty
Quick-fix for Krokodil making you into a zombie, your skin falls off, you don't become a zombie
Adds a Morphine medipen as per request of @paprika
Accidentally added frost oil bottles back in while trying to fix a merge conflict, whoops.
forgot to remove cyanide since we replaced it with the goon variant
Fixes and Tweaks
