* commit for branch swap
* branch swap again
* BLEED
* trying to clear up compile errors
* i killed everything when i tested this...
* restorealltheblood
* I REMOVED A THING
* well some progress
* stop bleeding
* got to swap branches again.
* grr
* damn bloodcolors
* Squash everything
* color....colourrrrrrr
* color....colourrrrrrr
* well now that updated the branch...
* Changes
* Some tweaks..before i upload something major
* COLOR NOT COLOUR...COLOR
YES I KNOW NOT EVERYONE SPELLS IT LIKE THAT BUT MY GOD
* Foot print shit..
blood coloring is going to be PAIN
* trying to handle some colors..maybe.
* blood colorsing sucks..di i mention this?
* commenting cod malfunctions.
* Changes
* lets try this
* Its too late at night.
* blargh
* woops
* almost works...
* progress..
* Branch swap
* figured out the overlay issue....
* BRANCH SWAP
* BLARGH
* fixed merged conflicts..expect something to be horribly wrong.
* bunch of changes
* Major Fixes
- Moved blood_state and bloodiness var definitions to
/obj/effect/decal/cleanable/blood as well as /cleanable/Crossed(), in
order to make blood color work properly.
- These were not used by any other decal, so it was pointless.
- Tweaked human/add_blood so that hand_blood_color uses the correct
value now.
- Corrected gibs having the wrong basecolor.
- Tracks of different blood colors will no longer combine weirdly, and
will instead form seperate overlays.
- This also fixes all of the issues with tracks in general and not
updating correctly.
- Fixed transfering blood in add_fingerprint; the old detective code
didn't use the new format for add_blood().
- Fixed xenomorphs causing runtimes in makeTrail(), and gave them their
own trails. Sprites should probably be brightened later.
- Fixed mobs occasionally randomly having their blood_DNA list reset.
* may have accidently removed shit.
* Mrowl
* stiff
water is not bleeding
lowered trail making threshold
* tweaks then conflcits
* weee
* indent
* some tweaks
* somefox tweaks.
* derp
* why won't they bleed!?
* BLEED DAMMIT
* Flattist comments and removes simple animale blood volume
Cause i cannot get it to work right.
* PRAISE FLATTIST
* Simple animals have a blood volume now
Bug with trail fixed.
* changes
* thanksmrowlmrowl
* exotice blood trails
* makesure is an exotic bleeder has a bleed rate first...
* FoxBoxTweakSox
* BoxVoxSoXFox
* ONE MORE THING
* animalsbleedreds
* Buh? BUGH!
* thisismescreaming
* removing note needed thing
* Color changes but the rabbit hole continues.
* This is not pretty....
* wot
* IT WORKS DAMMIT
* colors.
* germaphobic commit..
* we have to use the old system
* nothing to see here
* doubleprocarady
* try to fix mulebots
* mulebot fixed
* DONE
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.
Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
...based on distance, similar to projectiles.
Conflicts:
code/defines/obj.dm
code/game/machinery/kitchen/smartfridge.dm
code/game/machinery/vending.dm
code/game/mecha/equipment/weapons/weapons.dm
code/modules/games/cards.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living_defense.dm
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
Conflicts:
code/__HELPERS/unsorted.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/mob/living/simple_animal/bees.dm
code/modules/projectiles/gun.dm
code/modules/reagents/reagent_containers/syringes.dm
code/modules/surgery/eye.dm
Added sonic cannon skeleton code.
Noise cannon fire sound, Vox shriek sound.
Added Vox Armalis species.
Swapped vox breath mask over to species_restricted check.
Added Vox Armalis gear.
Added a random shriek effect to Vox and Vox Armalis speech.
Added quickspawn Vox Armalis definition.
Vox shriek sound effect. Thought I committed this earlier.
Added r_hand and l_hand icon_overwrite checks.
More work on Armalis. Added gut() and leap() human procs.
Adding/fixing up the leap() and gut() verbs, and a LEAPING status_flag for human/Bump().
Fixing some missing pixels in the armalis tail.
Almost forgot to whitelist armalis...
Conflicts:
code/modules/clothing/spacesuits/alien.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
icons/mob/suit.dmi
icons/obj/clothing/gloves.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/shoes.dmi
icons/obj/gun.dmi
