* 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
This adds Message filters to Goonchat (only for mentors +
administrators).
There is a new option in the settings dropdown of Goonchat to access
these. They are temporary, non-destructive filters which will hide all
messages matching them that are already in your chat, as well as any new
messages matching them.
There are 5 filters currently:
- Admin; Filters out most admin logs.
- Combat; Filters out a limited subset of combat messages-
Specifically, any message with the 'combat' span class. Currently, this
has only been added to the central /attack and /attacked_by procs, so a
large considerable amount of hostile actions taken against a
player are still not going to be filtered out. We can work on adding
the identifier to more stuff later.
- Radios: Filters out all radio messages.
- Speech: Filters out all mob speech.
- OOC: Filters out OOC chat.
There is also an "All" option, which just turns off all messages that
are not internal to Goonchat.
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.
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
This commit updates the previous commit with the latest changes from the
CB:GI git.
Primary Changes:
- Dancing! Passively grab someone, they passively grab you, looks like
dancing/wrestling. You get the image, I'm sure.
- Clarifications and possible runtime nipping.
This commit adds the following to the grab system:
- Knifing (Attack with edge weapon while neckgrabbing)
- Pressing eyes (Harm intent, neck grab, eye zone)
- Jointlocking (Grab intent, neck grab, almost any limb)
- Headbutting (Harm intent, neck grab, target chest or groin)
- Pin (Disarm intent, pins affecting to the ground until you move or let
go with help intent)
Adds agonyforce var to stun batons, which causes halloss and eye blur.
Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
Conflicts:
code/_onclick/item_attack.dm
code/game/objects/items/weapons/stunbaton.dm
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.
Conflicts:
code/game/gamemodes/wizard/artefact.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/melee/misc.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/weaponry.dm
code/game/objects/weapons.dm
code/modules/hydroponics/hydroitemdefines.dm
code/modules/surgery/tools.dm
