Commit Graph

32 Commits

Author SHA1 Message Date
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Fox McCloud
7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Fox McCloud
9c3fcaa53c AGHHHHHHHHHHHHH 2018-07-17 02:13:52 -04:00
Tayyyyyyy
dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Aurorablade
8e5f3102ff Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-07-31 17:20:30 -04:00
Fox-McCloud
b07eb1a0b5 Refactors Species Flags into Species Traits List 2017-07-13 18:55:45 -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
05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Aurorablade
818f9a0f40 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-06-28 22:10:08 -04:00
Aurorablade
536ddcc7bd Works 2017-06-24 22:31:42 -04:00
Sam
b69835e0e5 buffs scissors 2017-06-23 09:36:53 +01:00
Sam
4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
Sam
c1cc319f62 Uses more intent defines 2017-06-03 18:29:50 +01:00
Sam
07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Krausus
4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
CyrusJazzberry
a973be8f36 Barber's Scissors grammar fix
Just fixes the barber's scissors attack grammar. No more "has been beautifully cuts"!
2016-09-03 15:10:53 -05:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
KasparoVy
13003fe351 Merge branch 'temp2' into temp 2016-05-10 00:10:15 -04:00
Fox-McCloud
d1c54753c2 Fixes Safety Scissors Meta 2016-05-05 07:39:28 -04:00
KasparoVy
73dbbed70e Cutting Someone's Facial Hair will now Update Facial Hair 2016-04-30 20:48:58 -04:00
KasparoVy
f95655419c Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Adjusts Vox Hairstyle Names for Consistency -- PASS 1
Also fixes a typo or two.

TO DO: FULLY TEST AND SWEEP FOR BUGS, ERRORS AND RUNTIMES
2016-04-30 08:12:41 -04:00
KasparoVy
3b435c023a Refactor scissors, fix and finalize prefs, fix missing part definition for xion models, etc.
continued: Monitor changing verb will now only show a list of monitor
styles available for the monitor head brand you are using.

For example, if you chose any of the regular monitor heads (default
morpheus or anything suffixed with mtr.) you will get a list of IPC
standard monitor styles and nothing else.
However, if you chose the hesphiastos alt head (which is also a monitor,
but of a different style) the list will be populated with the monitor
styles suitable for that hesphiastos head, but none others (not even the
ipc standard ones, since those don't fit and hesphiastos alt. isn't in
the models_allowed list)
2016-04-21 19:59:09 -04:00
KasparoVy
6398e9c3fe Pass2 2016-04-21 19:58:38 -04:00
KasparoVy
98285c0518 No longer, I hope. 2016-03-17 20:37:41 -04:00
Fox-McCloud
2268e3c39e Implements a Few Goon Sounds 2016-03-07 23:54:12 -05:00
Fox-McCloud
17112cda3d barber update 2.0 2015-11-05 06:51:00 -05:00
Fox-McCloud
40a5abbb4a Barber Update 2015-11-05 02:04:46 -05:00