Commit Graph

580 Commits

Author SHA1 Message Date
tigercat2000
9a7a8c1f00 Merge pull request #8535 from KasparoVy/bloodsplatter-fix
Fixes #8508, the Needless Shedding of Blood
2018-01-21 13:43:19 -08:00
uraniummeltdown
f1577b43f7 ethereal jaunt water effect won't show during wraith jaunt
removed unnecessary icon var settings
2018-01-18 22:25:34 +05:00
uraniummeltdown
c89b1e8463 repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2018-01-18 13:03:49 +05:00
uraniummeltdown
9c90c817b6 adds missing lavastaff and guardian phase effect icons
kills off anim() proc, removes ninja rigsuit electricity effect
gets rid of the flick() in temporary_visual.dm because pooling is dead
updates ethereal_jaunt.dm and makes it OOP, wraiths no longer show the wizard animation, jaunters cannot move after duration is over, fixes directions errors
turns many anim() into obj/effect/overlay/temp
smoother pet heart animation
2018-01-18 12:56:18 +05:00
uraniummeltdown
8fd3a5e890 move cult effects to their own file
move cult beams to beam.dmi
2018-01-16 23:38:36 +05:00
uraniummeltdown
065fc69742 moves /obj/effect/overlay/temp to their own files
code cleanup
2018-01-16 23:00:29 +05:00
KasparoVy
a8492ba115 Shortens Helper Proc Name
Way too long.
Also adds sanity.
2018-01-10 17:19:10 -05:00
KasparoVy
f93c148c54 Fixes #8508
Checks for blood splatter in the target location properly and avoids creating too many blood atoms.
2018-01-09 22:07:34 -05:00
tigercat2000
591f718995 Merge pull request #7848 from KasparoVy/splat
Splatter Lands 1 Tile Away in Target Dir & Xeno-blood Splatter Colour Fix
2017-12-31 08:00:14 -08:00
Fox-McCloud
bd4ecf0bd4 Fixes Various Issues with Giant Spiders 2017-12-07 00:06:10 -05:00
uraniummeltdown
2fd7d2e32f finishing touches, particle effects pass tables and grilles 2017-11-04 23:36:36 +04:00
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown
5c4f4ec5e5 effect/system to effect_system
effect/effect to effect/particle_effect
make foam an effect again
move explosion_particles.dm to effect_system folder
OOP effect code, addtimers, QDEL_IN
fixed reagent explosions never having a flash range due to a typo
2017-11-04 18:21:51 +04:00
uraniummeltdown
f414d5065d /obj/effect information 2017-11-04 16:19:54 +04:00
uraniummeltdown
1bea7973bd -removed coughedtime from mob_defines.dm and added smoke_delay to living_defines.dm
-fading out smoke finally works
-removed the spawns in smoke code it now uses process()
-sleeping smoke uses Sleeping() instead of AdjustSleeping()
2017-11-04 15:21:26 +04:00
uraniummeltdown
718aaf4d87 removes the useless effect/delete() proc, used QDEL_IN and addtimers, nanofrost can weld scrubbers too, some more cleanup fixes and tried to get smoke fade_out to work (it doesn't work and hasn't in the past) 2017-11-04 12:06:35 +04:00
uraniummeltdown
a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
uraniummeltdown
4d0ea7b630 add fade out effect to all smoke (untested), move nanofrost smoke to effects_smoke.dm, make smoke effects OOP (unfinished) 2017-11-03 16:48:33 +04:00
uraniummeltdown
e1f5b6aa07 removed mustard gas smoke as it's not used anywhere 2017-11-01 20:27:32 +04:00
uraniummeltdown
4814e3e3d7 removed excessive spacing, removed var/ in proc args, used some ishelpers, absolute pathing for everything 2017-11-01 15:56:13 +04:00
uraniummeltdown
9e71ddd208 splits effect_system.dm into multiple files 2017-10-31 20:27:45 +04:00
Citinited
a0c3b893fe Fixes Travis 2017-10-15 23:03:43 +01:00
Citinited
be97382c26 Tigercat & Fox tweaks 2017-10-15 23:03:28 +01:00
Citinited
2881fad0a3 Radiation mines no longer affect species with RADIMMUNE or NO_DNA flags 2017-10-15 23:03:16 +01:00
tigercat2000
5e7a9a6470 Merge pull request #7904 from FlattestGuitar/guardian-memes
Holoparasites. Take two.
2017-10-15 14:48:20 -07:00
KasparoVy
29ee96be8f Blood Trail Colouration is the Same as Pools
Blood pools had a duplicate definition of "NO_CLIENT_COLOUR" while it
wasn't defined at all for blood trails.

This resulted in a bug where upon wearing a pair of noir shades or
becoming colourblind, blood trails would take on a different colouration
than blood pools (drips, etc.)

Now resolved by moving the duplicate definition to a place where it can
do some good.
2017-08-09 23:14:39 -04:00
FlattestGuitar
9f755e7b70 Adds /tg/ guardians 2017-07-29 18:48:40 +02:00
KasparoVy
8dbfc8ee1d Respects Windows and our Inability to Pass Them
Blood that would splatter onto windows is now pixel-shifted and renders
above them so you can A: Clean it with ease and B: See it in all its
gorey glory.

I had to get creative with how I detected structures blocking blood
splatter.

Janiborgs riding, sprayers spraying and cleaner grenades foaming over
adjacent tiles won't clean off wall/windowblood. You have to use soap
and click on the blood.
2017-07-25 22:49:57 -04:00
KasparoVy
849f698256 Respects Walls and our Inability to see Through Them & Xenosplatter Fix
Pixel shifts blood onto non-floor structures, thus respecting viewing
angles.

You are no longer able to see blood splattered on a wall from the other
side unless you've x-ray vision.

This also fixes a bug where xeno blood splatters were red.
2017-07-25 22:38:49 -04:00
Crazy Lemon
6a4e69f741 Merge pull request #7845 from Fox-McCloud/organsss
Fixes IPC and Diona Knockdown Immunity
2017-07-21 23:05:00 -07:00
Fox McCloud
b37c1cf4e7 Merge pull request #7814 from Crazylemon64/many_fixes
Runtime killer v2
2017-07-22 00:39:10 -04:00
Fox McCloud
c1087a6250 Merge pull request #7829 from Kyep/ts_blood_fix
Fixes #7826 & #7809 - blood decals being unanchored
2017-07-22 00:29:59 -04:00
Fox-McCloud
02f74932e2 Fixes IPC and Diona Knockdown Immunity 2017-07-20 21:01:55 -04:00
Kyep
a3ea959bc1 Fox request 2017-07-19 04:54:23 -07:00
Kyep
84bdc87cb7 Fixes #7809 - Makes /obj/effect/decal/cleanable anchored instead 2017-07-18 22:55:39 -07:00
Crazylemon64
3a00e0f083 Fixes for numerous runtimes 2017-07-16 14:42:11 -07:00
Fox-McCloud
6d38ed3d90 colors 2017-07-15 05:40:14 -04:00
Fox-McCloud
88cc556c4f Adds Gunshot Blood Splatter 2017-07-14 11:26:15 -04:00
Fox-McCloud
511a8a37b6 Merge remote-tracking branch 'upstream/master' into disease-controller-bye-bye 2017-07-11 17:13:47 -04:00
Aurorablade
476cdc3e06 Blood Refactor (#6220)
* 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
2017-07-11 16:49:11 -04:00
Fox McCloud
23ee7f02d5 Merge pull request #7567 from SamHPurp/re-factors-posters
Refactors posters
2017-07-10 18:48:21 -04:00
Sam
ded0acb5f9 adjusted speed 2017-07-10 23:24:14 +01:00
Sam
e0fb2433dd Tweaks for fox 2017-07-10 23:08:08 +01:00
Fox-McCloud
17d7232cf3 Removes Disease one and Virology 2017-07-08 23:10:17 -04:00
Fox-McCloud
b65658e87b qdel null 2017-07-05 23:20:13 -04:00
Fox-McCloud
8a6f7b86da beep 2017-07-05 17:18:10 -04:00
Fox-McCloud
2206db4150 Wherein I Grump at Bad Code 2017-07-05 17:15:51 -04:00
Sam
a0e71daefb Nulls out the var 2017-07-05 22:00:49 +01:00
Sam
f808e50ab1 Garbage. Lots of garbage. 2017-07-05 20:45:56 +01:00
Fox-McCloud
426c39ef3f Icon Fixes 2017-06-30 03:21:12 -04:00