cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,718 Commits 26 Branches 2 Tags
d8a00048bd9f052d7a8de3a637cc5574869faac6
Commit Graph

621 Commits

Author SHA1 Message Date
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
c1c4b08807 Merge pull request #8476 from uraniummeltdown/decon 
deconstruct() at obj level + other changes
 2018-01-02 10:28:17 -08:00
Alffd
379b6621d3 There is no u in color 2017-12-31 13:35:37 -05:00
tigercat2000
6bcc18cd8b Merge pull request #8462 from Fox-McCloud/emp-proof 
EMP-Proof Organ Framework
 2017-12-31 08:22:04 -08:00
tigercat2000
868261b228 Merge pull request #8204 from Vivalas/moar_nerfs 
Adds organ cleansing to surgery
 2017-12-31 08:19:01 -08: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
tigercat2000
be9e258fd9 Merge pull request #8468 from Aurorablade/SaltInTheEyes 
Decouples Darksight from Colorblind
 2017-12-31 06:33:49 -08:00
Aurorablade
e862c8ee42 ...i messed up a var name... 2017-12-29 12:22:10 -05:00
uraniummeltdown
75e177b7a9 renames receive_damage() for animations to receiving_damage() 
renames take_damage() for organs to receive_damage()
renames Deconstruct() to deconstruct() for atmos objects
obj_integrity, max_integrity, integrity_failure vars moved to /obj level, obj_integrity = max_integrity on New()
 2017-12-28 00:32:54 +05:00
Aurorablade
c59bc57e14 grey and unathi change revert 2017-12-27 11:51:49 -05:00
uraniummeltdown
73d7af2675 moves var/can_deconstruct to obj level 
moves proc/deconstruct() and proc/take_damage() to obj level, moves a few obj damage procs in with it to new obj_defense.dm
moves plastic flaps to new plasticflaps.dm
 2017-12-26 18:16:42 +05:00
Aurorablade
c2dca57cb1 indent tweak 2017-12-25 00:50:24 -05:00
Vivalas
41cb2de4e7 Merge branch 'master' into moar_nerfs 2017-12-24 18:46:33 -06:00
Fox McCloud
1453834db5 EMP-Proof Organ Framework 2017-12-20 00:09:17 -05:00
HugoLuman
e1536129bb Changes umpteen vars back to a list, similar to what simple mobs have for damage coefficients 
Signed-off-by: HugoLuman <qaggeler@gmail.com>
 2017-12-15 13:20:00 -08:00
HugoLuman
c65fa1dd72 Makes it possible to have different modifiers for temperature damage in lungs 
Signed-off-by: HugoLuman <qaggeler@gmail.com>
 2017-12-15 12:37:34 -08:00
HugoLuman
6dd7fb81cd Makes changes to code suggested by Fox 
Cleans up and simplifies a bit

Signed-off-by: HugoLuman <qaggeler@gmail.com>
 2017-12-14 00:47:32 -08:00
HugoLuman
f72a55dbec Refactors new lung breath code to fix Drask 
Allows multiple damage types for lung temperature damage
Fixes #8432

Signed-off-by: HugoLuman <qaggeler@gmail.com>
 2017-12-06 00:49:14 -08:00
Aurorablade
51b691b689 it works 2017-12-04 01:06:51 -05:00
Aurorablade
203e998640 oh god here we go 2017-12-03 23:03:56 -05:00
tigercat2000
48d78b4648 Merge pull request #7832 from Fox-McCloud/lungsss 
Breathing is Now Handled on Lungs
 2017-12-01 17:51:19 -08:00
Fox-McCloud
b1e729e1dd lung specific damage behavior 2017-11-18 19:29:58 -05:00
Fox-McCloud
6ec234430e Merge remote-tracking branch 'upstream/master' into lungsss 
# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
#	code/modules/mob/living/carbon/carbon_defines.dm
 2017-11-18 18:49:47 -05:00
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
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
be971ffa5a SURGERY FOR PRESIDENT 2016 
Slight tweak

Adds surgery

Tweak for balance

Plot twist, Hillary won, and surgery is hugbox
 2017-10-08 16:08:30 -05: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
Fox-McCloud
003277a89d Merge remote-tracking branch 'upstream/master' into lungsss 2017-09-17 01:02:33 -04: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
4479185d6e Merge remote-tracking branch 'upstream/master' into lungsss 2017-08-16 19:20:19 -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
9d14e6c9da Merge remote-tracking branch 'upstream/master' into lungsss 
# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm
 2017-08-05 19:03:52 -04: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
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