Commit Graph
2934 Commits
Author SHA1 Message Date
Fox-McCloud 027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00
Crazy LemonandGitHub 6a4e69f741 Merge pull request #7845 from Fox-McCloud/organsss
Fixes IPC and Diona Knockdown Immunity
2017-07-21 23:05:00 -07:00
Fox McCloudandGitHub b37c1cf4e7 Merge pull request #7814 from Crazylemon64/many_fixes
Runtime killer v2
2017-07-22 00:39:10 -04:00
Fox-McCloud 1ecd7f13fc instant updates 2017-07-21 02:19:12 -04:00
Fox-McCloud 5bba6c70f7 Limits BLood Volume to 560 2017-07-18 00:10:43 -04:00
Crazylemon64 3a00e0f083 Fixes for numerous runtimes 2017-07-16 14:42:11 -07:00
Fox-McCloud 5a93390291 Fixes Blood Math 2017-07-15 05:10:33 -04:00
tigercat2000andGitHub 403417a5b5 Merge pull request #7798 from Fox-McCloud/blood-runtime-fix
Fixes Blood Runtime
2017-07-14 19:14:54 -07:00
Fox-McCloud 3c54268801 Fixes Blood Runtime 2017-07-14 01:04:19 -04:00
Fox-McCloud b07eb1a0b5 Refactors Species Flags into Species Traits List 2017-07-13 18:55:45 -04:00
Fox-McCloud 0401e4fe6e faster blood metabolization 2017-07-12 18:38:04 -04:00
FlattestGuitar 6499f31df4 Merge me a river 🎶 2017-07-12 21:13:20 +02:00
Fox-McCloud 1a9d5b0408 Improves the quality of life of Cluwnes 2017-07-12 06:16:17 -04:00
Fox-McCloud e02946f3e7 Blood Refactor Fixes 2017-07-12 02:14:53 -04:00
Fox-McCloud 511a8a37b6 Merge remote-tracking branch 'upstream/master' into disease-controller-bye-bye 2017-07-11 17:13:47 -04:00
AurorabladeandFox McCloud 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 17d7232cf3 Removes Disease one and Virology 2017-07-08 23:10:17 -04:00
tigercat2000andGitHub fef7abc867 Merge pull request #7672 from Fox-McCloud/syndicate-bomb-refactor
Refactors Syndicate Bombs and Adds Chemical Bombs
2017-07-04 11:53:55 -07:00
tigercat2000andGitHub 1ae7f2930c Merge pull request #7689 from Fox-McCloud/thats-the-power-of-love
🎵 That's the Power of Love🎵
2017-07-04 11:15:32 -07:00
fludd12 58520a69a9 Fixes two things 2017-07-02 01:30:25 -04:00
Fox-McCloud 4492b5ece3 That's the Power of Love~ 2017-07-01 22:07:44 -04:00
tigercat2000andGitHub 96bd0b80e0 Merge pull request #6516 from fludd12/Grey-Rework
Grey Rework
2017-06-30 08:29:31 -07:00
Fox-McCloud b664f73a68 chemical bombs 2017-06-29 20:02:27 -04:00
Aurorablade 818f9a0f40 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-06-28 22:10:08 -04:00
Sam 560975b638 pedantry 2017-06-23 15:47:37 +01:00
Sam 4eeb706462 makes water coolers movable 2017-06-23 13:22:11 +01:00
Aurorablade ed5fc5c55a halp 2017-06-22 20:30:19 -04:00
FlattestGuitar 086327ef65 Can't taste pills and patches 2017-06-14 18:39:08 +02:00
Sam 4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
Fox-McCloud bca44eb0ee Adds Peacekeeper Borgs 2017-06-03 17:01:42 -04:00
tigercat2000 633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Fox McCloudandGitHub 1c21d8eb98 Merge pull request #7403 from SamHPurp/Punching-above-its-weight
Refactoring to use the WEIGHT_CLASS defines.
2017-05-28 14:17:05 -04:00
Sam 2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Fox McCloudandGitHub 3587aad06e Merge pull request #6612 from Crazylemon64/partial_cloning
Cloning now puts you together bit by bit
2017-05-27 14:48:23 -04:00
FlattestGuitar 77260eeceb More taste tweaks. 2017-05-23 21:30:44 +02:00
FlattestGuitar e4bafa2a7e Changes! 2017-05-18 08:33:33 +02:00
FlattestGuitar 84fdc3d9f1 Adds reagent taste messages 2017-05-18 02:24:27 +02:00
FlattestGuitar a407b88124 Adds a taste system! 2017-05-18 01:00:00 +02:00
Crazy LemonandGitHub 5c66160210 Merge pull request #6957 from Fox-McCloud/neurotoxin-nerf
Nerfs Neuro-Toxin
2017-05-17 14:45:40 -07:00
fludd12 757d4a66be Redoes everything 2017-05-16 23:07:50 -04:00
Fox McCloudandGitHub f52bef5ec0 Merge pull request #7199 from Crazylemon64/controller_reboot_fix
Makes the master controller's auto-restart work
2017-05-13 19:55:03 -04:00
Fox-McCloud 31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Fox McCloudandCrazy Lemon 877b5d8457 Droppers Refactor (#7269)
* Droppers Refactor

* tweaks
2017-05-11 18:53:16 -07:00
Crazylemon64 908c129fb9 Rebooting works now! 2017-05-07 02:41:55 -07:00
Crazylemon64 ee7b0f070b Integrates corazone properly 2017-05-02 00:52:59 -07:00
Crazylemon64 528e359296 Refactors heart attacks, unbreaks incremental cloning 2017-05-01 05:35:45 -07:00
Crazylemon64 1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
Crazy LemonandGitHub 893fd2178e Merge pull request #6896 from pinatacolada/greasyhandsforrealsies
Dirty surgery rooms more prone to infections and ghetto surgery internal organ disinfection and dead limb revival
2017-04-26 18:51:10 -07:00
Mark van AlphenandGitHub d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Kyep 1d3de58510 Removes Obj & Turf reactions from Plasma Dust
🆑 Kyep
rscdel: Plasma dust no longer creates plasma gas on objects or turfs
during reactions.
/🆑
2017-04-16 18:24:03 -07:00