Commit Graph

552 Commits

Author SHA1 Message Date
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
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
Sam
0f006dbbb4 Refactors posters 2017-06-17 02:08:13 +01:00
Sam
d0dde4f3d7 Uses more QDEL_NULLs 2017-06-15 00:49:00 +01:00
Fox McCloud
9a774cee7a Merge pull request #7415 from Kyep/glowshroom_wirecutter
Wirecutters destroy glowshrooms
2017-06-09 15:13:55 -04:00
tigercat2000
b419782526 Luxury Bluespace Capsule & More
tgstation/tgstation#27881

There is now a second bluespace shelter capsule, which is much more
fancy & expensive. Note, this still does not make them generally available.

Changes Summary:
 - Added "Shelter Beta" - It comes with a built in kitchen, toilet, shower, three
 course meal, and an artifact™️! There are plenty of secrets to
 behold..
 - Added black carpeting. This can be created by the personal crafting
 menu and having any crayon + a carpet with you.
 - Added fancy wooden and fancy black wooden tables. These are craftable
 by hitting wooden table parts with regular and black carpet,
 respectively.
 - You can now unanchor, deconstruct and color shower curtains. Use any kind of
 crayon to color them, and screwdriver to unanchor them. Once they are
 unanchored, you may use wirecutters to change them back into materials-
 All of which are used in a new crafting recipe for creating them.
 - Display cases moderately refactored.
 - Added survival pod windows/windoors for the new luxury pod.
2017-06-07 11:17:44 -07:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Kyep
4efc4cc3a5 Updates to make sharp items effective more generally 2017-05-29 18:54:17 -07:00
Kyep
b6311e4d4d Wirecutters destroy glowshrooms
Two hits with a wirecutter now destroy glowshrooms.
This makes it possible to remove glowshroom infestations more easily
without scythes.
2017-05-28 20:47:24 -07:00
Tigercat2000
bbca8405ef -tg- Move Refactor
This commit ports /tg/'s move refactor.

The throwing system has been replaced entirely, removing the necessity
of throw_at_fast and resolving multiple outstanding issues, such as
crossbows being unusable.

Spacedrifting has also been upgraded to function with the new throwing
system. It is now it's own process.

Tickcomp has been killed, and the config values have been adjusted to
more or less match live Paradise.

All mobs now share a common Bump() proc. There are only four mobtypes
which do not, including humans and simple animals. With the exception
of mob types that do not ever want to Bump() or be Bumped(), they should
call the parent proc.

Human movement slowdown has been moderately tweaked in how it stacks effects;
It shouldn't be significantly different from a player perspective.

Mobs will now spread fire if they bump into another mob. I don't want to set
the world on fiiiire, I just want start a flame in your heart~

For player facing changes: Input delay has been reduced by roughly ~50ms for
any direction keys, by advantage of a previously unknown flag on byond verbs
which allow them to operate independently from the tick rate of the server.
You may need to clear your interface.dmf file if you have a custom skin for
this change to function.
2017-05-25 06:35:01 -07:00
Sam
dab3188c3c fixes Contraband poster issues 2017-05-17 00:57:59 +01:00
TravellingMerchant
d2d1af7270 defines posters 2017-05-16 01:33:47 +01:00
Fox McCloud
20ab3ee64d Makes Clothing Accessories, Clothing with Accessories, Blood, and Spiderlings GC (#7272)
* Makes Clothing Accessories and Clothing with Accessories GC

* and spiderlings, apparently

* BLOOOD FINALLY GARBAGE COLLECTS!!!!
2017-05-11 18:50:43 -07:00
Fox McCloud
153de130f4 Merge pull request #7130 from FalseIncarnate/bugfix
Allows scythes to mass-clear glowshrooms
2017-04-26 00:10:26 -04:00
FalseIncarnate
f7c76befff Variable rename and operator change
Changes the variable name to avoid confusion, and changes the math to
use the *= operator.

Also does the same for the spacevines, for consistency.
2017-04-25 23:55:40 -04:00
FalseIncarnate
f8b5a7025e Fixes folded tele-scythes not doing ANY damage
I knew that return was there for a reason...
2017-04-21 16:03:04 -04:00
Crazy Lemon
327f89c890 Merge pull request #6950 from Fox-McCloud/tesla-tweaks
Tesla Update
2017-04-21 09:52:23 -07:00
FalseIncarnate
faf0567774 Allows scythes to mass-clear glowshrooms
Glowshrooms are no longer immune to the reaper's touch, and will be
shredded by scythes just like vines.
2017-04-19 15:42:14 -04:00
Mark van Alphen
d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Crazy Lemon
18ffff09f4 Merge pull request #7026 from warior4356/Virtual-Avatars
VR Phase #1
2017-04-18 21:25:35 -07:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Fox-McCloud
8fb17b2bee moarrr 2017-04-04 04:26:53 -04:00
Fox-McCloud
9a20311152 better QDEL_NULL 2017-04-04 00:35:42 -04:00
Fox-McCloud
fb02933f30 For qdel and Destroy Fixes 2017-04-03 19:06:20 -04:00
Crazy Lemon
de8c504a19 Merge pull request #6910 from SamHPurp/spawner-map-utilities
Adds tools for mappers
2017-04-03 01:14:16 -07:00
Warior4356
6807b8ba95 Merge remote-tracking branch 'ParadiseSS13/master' into Virtual-Avatars 2017-04-02 02:47:42 -07:00
Warior4356
dbf989be51 Phase one done. 2017-04-02 01:50:51 -07:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Crazy Lemon
9c233a676d Merge pull request #6865 from Fox-McCloud/receiverssss
Adds Modular Receivers to Loot Table and Hacked Autolathes
2017-03-30 18:32:32 -07:00