Commit Graph

585 Commits

Author SHA1 Message Date
Aurorablade
0aaaf3a11c THESE WOUNDS THEY WILL NOT HEAL 2017-10-15 22:26:34 -04:00
TDSSS
1e7575afde Adjusted ghetto surgery tool chances to keep ghetto surgery chances overall roughly equal. Also added rigsuit removal to list of surgeries that don't care about pain. 2017-10-15 15:28:25 -07:00
TDSSS
897e201775 Started on surgery stuff
Adds pain modifier to surgery if patient is conscious

Now actually compiles

Makes surgery easier if patient is drunk, allowing for easier ghetto surgery.

Now reduces failure chance if painkillers are in the patient's system.

Fixed argument spacing (hopefully)

Repairing robotic limbs no longer needs anesthesia.

Revert "Repairing robotic limbs no longer needs anesthesia."

This reverts commit 12c1f4140a.

Repairing robotic limbs doesn't cause a pain modifier, because they don't feel pain. Now actually works.

Moves typecasting from the helper proc to outside fo it and checks for sleeping.

Now correctly checks for repair to robotic limbs.

Increased effectiveness of Hydrocodone and Morphine to 99% on maintainer recommendation.
2017-10-15 15:28:13 -07:00
tigercat2000
b316f484e6 Merge pull request #7609 from Vivalas/splint_nerf
Makes surgery great again (nerfs splints)
2017-10-15 14:00:17 -07:00
Vivalas
f202816c71 Now look at this [src.name], that I just found....
When I say go, be ready to throw!

....

IT'S [name] NOT [src.name]!! Aagh, Let's try something else...
2017-09-17 17:54:53 -05:00
Vivalas
891895f467 SPAN ME UP
SPAN ME UP INSIDE!!!!

I CAN'T SPAN UP

SAVEEEEE MEEEEEEEEE
2017-09-17 17:46:27 -05:00
Vivalas
3443b57e0a qdel Destroy() fix 2017-09-16 14:19:59 -05:00
Vivalas
0a6fe18e77 Hurrah! It compiles 2017-09-09 19:55:49 -05:00
Vivalas
4fb6c0365e Merge remote-tracking branch 'upstream/master' into splint_nerf 2017-09-09 19:21:33 -05:00
Aurorablade
df3d13ad7d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-09-02 22:49:05 -04:00
Aurorablade
9956a4a90a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-08-23 17:37:22 -04:00
Fox-McCloud
6a24d8bc02 Fixes Bloodless Internal Bleeding 2017-08-22 17:25:27 -04:00
Fox-McCloud
cf4735a069 Merge remote-tracking branch 'upstream/master' into HUNKE 2017-08-16 18:36:30 -04:00
tigercat2000
ebabda1223 Merge pull request #7366 from KasparoVy/mob_rgb_to_hex
Converts Mob Colours to Hexadecimal
2017-08-16 12:52:13 -07:00
Aurorablade
46b99794b0 Surgery Fix 2017-08-14 18:50:58 -04:00
Vivalas
dc0a008fe2 Merge branch 'master' into splint_nerf 2017-08-13 23:13:24 -05:00
Fox-McCloud
5443a3f6d3 Fixes Fox Being A Moron 2017-08-03 00:30:56 -04:00
Crazy Lemon
5d85b6697c Merge pull request #7870 from Fox-McCloud/tweaks/fixes/organ/stuff
Various little fixes/refactors
2017-08-01 21:41:13 -07:00
Aurorablade
8e5f3102ff Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-07-31 17:20:30 -04:00
Fox-McCloud
0f168fab4e multiplication memes 2017-07-25 15:40:56 -04:00
Fox-McCloud
81d3acb6d6 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-25 15:21:28 -04:00
Fox-McCloud
b34c14739b Various little fixes/refactors 2017-07-25 08:15:25 -04:00
Fox-McCloud
211038b6c7 Fixes Infections in Organs from Cloning 2017-07-23 18:19:23 -04:00
KasparoVy
a6bb591b46 Converts Mob Colours to Hexadecimal
No front-end changes. This just means that mob colours now take up less columns in the database, incur less processing (reduced rgb() calls) and reduces the amount of code dedicated to them.
2017-07-22 19:59:58 -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
7cda52c713 Merge pull request #7818 from Crazylemon64/item_stumbling
Item stumbling refactor
2017-07-22 01:55:19 -04: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
1ecd7f13fc instant updates 2017-07-21 02:19:12 -04:00
Fox-McCloud
02f74932e2 Fixes IPC and Diona Knockdown Immunity 2017-07-20 21:01:55 -04:00
tigercat2000
e0dad32b50 Merge pull request #7806 from Fox-McCloud/FUCK-YOUR-CUNT-YOU-SHIT-EATING-CUNT-TILL-YOU-ARE-A-MASS-EATING-SHIT-CUNT-EAT-PENISES-IN-YOUR-FUCK-FACE-AND-SHIT-OUT-ABORTIONS-TO-FUCK-UP-SHIT-IN-YOUR-ASS-YOU-COCK-FUCK-SHIT
Removes Bay's Wound System
2017-07-19 14:13:49 -07:00
Fox-McCloud
5bba6c70f7 Limits BLood Volume to 560 2017-07-18 00:10:43 -04:00
Crazylemon64
a8e7716649 Refactors slipping to be completely general for items 2017-07-16 19:20:55 -07:00
Crazylemon64
3a00e0f083 Fixes for numerous runtimes 2017-07-16 14:42:11 -07:00
Fox-McCloud
2c4952b803 finally 2017-07-16 04:07:54 -04:00
Fox-McCloud
d37d18e660 kill it dead 2017-07-15 23:51:53 -04:00
Fox-McCloud
93abbe25a4 BURNNNNNNN 2017-07-15 23:43:51 -04:00
Fox-McCloud
cb35d1f6e9 Binsult.ogg 2017-07-15 12:12:59 -04:00
Fox-McCloud
3deaf6ece8 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-15 06:20:26 -04:00
Fox-McCloud
5a93390291 Fixes Blood Math 2017-07-15 05:10:33 -04:00
Fox-McCloud
5073247210 lips 2017-07-14 21:46:48 -04:00
Fox-McCloud
599c686e9c Removes Cryostasis Bags 2017-07-13 22:21:54 -04:00
Fox-McCloud
b07eb1a0b5 Refactors Species Flags into Species Traits List 2017-07-13 18:55:45 -04: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
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
17d7232cf3 Removes Disease one and Virology 2017-07-08 23:10:17 -04:00
Fox-McCloud
354cc6a987 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-04 17:17:09 -04:00
Fox-McCloud
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox-McCloud
e1cc7e1431 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-01 20:17:16 -04:00