cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

The Most Non-Edgey PR Ever

Browse Source
This commit is contained in:
Fox-McCloud
2017-07-01 19:48:43 -04:00
parent 52af2d8c0e
commit 05a24da2e8
56 changed files with 66 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/face.dm
+1 -1
View File
@@ -106,7 +106,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='warning'> [user]'s hand slips, tearing skin on [target]'s face with \the [tool]!</span>", \
"<span class='warning'> Your hand slips, tearing skin on [target]'s face with \the [tool]!</span>")
target.apply_damage(10, BRUTE, affected, sharp=1, edge=1)
target.apply_damage(10, BRUTE, affected, sharp = 1)
return 0
/datum/surgery_step/face/cauterize
code/modules/surgery/generic.dm
+2 -2
View File
@@ -143,7 +143,7 @@
msg = "<span class='warning'> [user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]</span>"
self_msg = "<span class='warning'> Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!</span>"
user.visible_message(msg, self_msg)
target.apply_damage(12, BRUTE, affected, sharp=1)
target.apply_damage(12, BRUTE, affected, sharp = 1)
return 0
/datum/surgery_step/generic/cauterize
@@ -236,7 +236,7 @@
add_logs(user, target, "surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")//log it
var/atom/movable/thing = affected.droplimb(1,DROPLIMB_EDGE)
var/atom/movable/thing = affected.droplimb(1,DROPLIMB_SHARP)
if(istype(thing,/obj/item))
user.put_in_hands(thing)
return 1
code/modules/surgery/limb_reattach.dm
+3 -3
View File
@@ -126,7 +126,7 @@
var/obj/item/organ/external/E = tool
user.visible_message("<span class='alert'>[user]'s hand slips, damaging [target]'s [E.amputation_point]!</span>", \
"<span class='alert'>Your hand slips, damaging [target]'s [E.amputation_point]!</span>")
target.apply_damage(10, BRUTE, null, sharp=1)
target.apply_damage(10, BRUTE, null, sharp = 1)
return 0
@@ -213,7 +213,7 @@
var/obj/item/organ/external/E = target.get_organ(target_zone)
user.visible_message("<span class='alert'>[user]'s hand slips, damaging [target]'s [E.amputation_point]!</span>", \
"<span class='alert'>Your hand slips, damaging [target]'s [E.amputation_point]!</span>")
target.apply_damage(10, BRUTE, null, sharp=1)
target.apply_damage(10, BRUTE, null, sharp = 1)
return 0
/datum/surgery_step/limb/mechanize
@@ -271,5 +271,5 @@
/datum/surgery_step/limb/mechanize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='alert'>[user]'s hand slips, damaging [target]'s flesh!</span>", \
"<span class='alert'>Your hand slips, damaging [target]'s flesh!</span>")
target.apply_damage(10, BRUTE, null, sharp=1)
target.apply_damage(10, BRUTE, null, sharp = 1)
return 0
code/modules/surgery/organs/augments_internal.dm
+2 -2
View File
@@ -315,10 +315,10 @@
if(prob(50))
if(lasthand == "r_hand")
var/obj/item/organ/external/limb = owner.get_organ("r_arm")
limb.droplimb(0, DROPLIMB_EDGE)
limb.droplimb(0, DROPLIMB_SHARP)
else if(lasthand == "l_hand")
var/obj/item/organ/external/limb = owner.get_organ("l_arm")
limb.droplimb(0, DROPLIMB_EDGE)
limb.droplimb(0, DROPLIMB_SHARP)
owner.say("I HAVE BEEN DISARMED!!!")
owner.adjustFireLoss(25)//severely injure him!
overloaded = TRUE
code/modules/surgery/organs/organ.dm
+1 -1
View File
@@ -233,7 +233,7 @@ var/list/organ_cache = list()
W.time_inflicted = world.time
//Note: external organs have their own version of this proc
/obj/item/organ/proc/take_damage(amount, var/silent=0)
/obj/item/organ/proc/take_damage(amount, silent = 0)
if(tough)
return
if(status & ORGAN_ROBOT)
code/modules/surgery/organs/organ_external.dm
+7 -7
View File
@@ -194,7 +194,7 @@
DAMAGE PROCS
****************************************************/
/obj/item/organ/external/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list())
/obj/item/organ/external/take_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list())
if(tough)
brute = max(0, brute - 5)
burn = max(0, burn - 4)
@@ -276,7 +276,7 @@
if(possible_points.len)
//And pass the pain around
var/obj/item/organ/external/target = pick(possible_points)
target.take_damage(brute, burn, sharp, edge, used_weapon, forbidden_limbs + src)
target.take_damage(brute, burn, sharp, used_weapon, forbidden_limbs + src)
if(fail_at_full_damage == 2 && body_part != UPPER_TORSO && body_part != LOWER_TORSO)
var/losstype
if(burn > brute)
@@ -292,8 +292,8 @@
if(owner && loc == owner)
if(!cannot_amputate && config.limbs_can_break && (brute_dam) >= (max_damage * config.organ_health_multiplier))
if(prob(brute / 2))
if(edge)
droplimb(0,DROPLIMB_EDGE)
if(sharp)
droplimb(0, DROPLIMB_SHARP)
if(owner_old) owner_old.updatehealth()
return update_icon()
@@ -696,10 +696,10 @@ Note that amputating the affected organ does in fact remove the infection from t
return
if(!disintegrate)
disintegrate = DROPLIMB_EDGE
disintegrate = DROPLIMB_SHARP
switch(disintegrate)
if(DROPLIMB_EDGE)
if(DROPLIMB_SHARP)
if(!clean)
var/gore_sound = "[(status & ORGAN_ROBOT) ? "tortured metal" : "ripping tendons and flesh"]"
owner.visible_message(
@@ -748,7 +748,7 @@ Note that amputating the affected organ does in fact remove the infection from t
victim.regenerate_icons()
dir = 2
switch(disintegrate)
if(DROPLIMB_EDGE)
if(DROPLIMB_SHARP)
compile_icon()
add_blood(victim)
var/matrix/M = matrix()
code/modules/surgery/organs/subtypes/standard.dm
+2 -2
View File
@@ -219,8 +219,8 @@
..()
/obj/item/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list())
..(brute, burn, sharp, edge, used_weapon, forbidden_limbs)
/obj/item/organ/external/head/take_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list())
..(brute, burn, sharp, used_weapon, forbidden_limbs)
if(!disfigured)
if(brute_dam > 40)
if(prob(50))
code/modules/surgery/organs/wound.dm
+5 -5
View File
@@ -318,15 +318,15 @@ datum/wound/cut/massive
/datum/wound/lost_limb/New(var/obj/item/organ/external/lost_limb, var/losstype, var/clean)
var/damage_amt = lost_limb.max_damage
if(clean) damage_amt /= 2
switch(losstype)
if(DROPLIMB_EDGE, DROPLIMB_BLUNT)
if(DROPLIMB_SHARP, DROPLIMB_BLUNT)
damage_type = CUT
max_bleeding_stage = 3 //clotted stump and above can bleed.
stages = list(
"ripped stump" = damage_amt*1.3,
"bloody stump" = damage_amt,
"clotted stump" = damage_amt*0.5,
"bloody stump" = damage_amt,
"clotted stump" = damage_amt*0.5,
"scarred stump" = 0
)
if(DROPLIMB_BURN)
@@ -337,7 +337,7 @@ datum/wound/cut/massive
"scarred stump" = damage_amt*0.5,
"scarred stump" = 0
)
..(damage_amt)
/datum/wound/lost_limb/can_merge(var/datum/wound/other)
code/modules/surgery/robotics.dm
+1 -1
View File
@@ -538,7 +538,7 @@
add_logs(user, target, "surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")//log it
var/atom/movable/thing = affected.droplimb(1,DROPLIMB_EDGE)
var/atom/movable/thing = affected.droplimb(1,DROPLIMB_SHARP)
if(istype(thing,/obj/item))
user.put_in_hands(thing)
code/modules/surgery/tools.dm
-3
View File
@@ -43,7 +43,6 @@
flags = CONDUCT
force = 15.0
sharp = 1
edge = 1
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "materials=1;biotech=1"
attack_verb = list("drilled")
@@ -63,7 +62,6 @@
flags = CONDUCT
force = 10.0
sharp = 1
edge = 1
w_class = WEIGHT_CLASS_TINY
throwforce = 5.0
throw_speed = 3
@@ -123,7 +121,6 @@
flags = CONDUCT
force = 15.0
sharp = 1
edge = 1
w_class = WEIGHT_CLASS_NORMAL
throwforce = 9.0
throw_speed = 3