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

Fox Fixes

Browse Source 
... I just removed the damned warning messages, I'm not even going to
bother figuring out an appropirate message to say. Also, other requested
changes.
This commit is contained in:
Twinmold
2017-04-06 02:59:22 -05:00
parent 7235a0dd98
commit 0afa47e9e8
4 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+4 -14
View File
@@ -44,13 +44,7 @@
return type
/obj/machinery/cooker/deepfryer/special_attack(obj/item/weapon/grab/G, mob/user)
if(istype(G.affecting, /mob/living/carbon/human))
// if(!iscarbon(G.affecting))
// to_chat(user, "<span class='warning'>You can only harm carbon-based creatures this way!</span>")
// return 0
// if(G.affecting.stat == DEAD)
// to_chat(user, "<span class='warning'>[G.affecting] is dead!</span>")
// return 0
if(ishuman(G.affecting))
if(G.state < GRAB_AGGRESSIVE)
to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
return 0
@@ -61,16 +55,12 @@
return 0
C.visible_message("<span class='danger'>[user] dunks [C]'s face into [src]!</span>", \
"<span class='userdanger'>[user] dunks your face into [src]!</span>")
if(!C.stat)
C.emote("scream")
user.changeNext_move(CLICK_CD_MELEE)
if(!(head.status & ORGAN_ROBOT))
C.apply_damage(25, BURN, "head") //25 fire damage and disfigurement because your face was just deep fried!
head.disfigure("burn")
add_logs(G.assailant, G.affecting, "deep-fried face")
C.apply_damage(25, BURN, "head") //25 fire damage and disfigurement because your face was just deep fried!
head.disfigure("burn")
add_logs(user, G.affecting, "deep-fried face")
qdel(G) //Removes the grip so the person MIGHT have a small chance to run the fuck away and to prevent rapid dunks.
else
to_chat(user, "<span class='warning'>You can only harm carbon-based creatures this way!</span>")
return 0
code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
+5 -17
View File
@@ -45,7 +45,7 @@
efficiency = round((E/2), 1) // There's 2 lasers, so halve the effect on the efficiency to keep it balanced
/obj/machinery/kitchen_machine/grill/special_attack(obj/item/weapon/grab/G, mob/user)
if(istype(G.affecting, /mob/living/carbon/human))
if(ishuman(G.affecting))
if(G.state < GRAB_AGGRESSIVE)
to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
return 1
@@ -54,25 +54,13 @@
var/obj/item/organ/external/chest/chest = C.get_organ("chest")
var/obj/item/organ/external/arm/l_arm = C.get_organ("l_arm")
var/obj/item/organ/external/arm/right/r_arm = C.get_organ("r_arm")
if(!head)
to_chat(user, "<span class='warning'>This person doesn't have a head!</span>")
return 1
C.visible_message("<span class='danger'>[user] forces [C] onto [src], searing [C]'s upper body!</span>", \
C.visible_message("<span class='danger'>[user] forces [C] onto [src], searing [C]'s body!</span>", \
"<span class='userdanger'>[user] forces you onto [src]! It burns!</span>")
if(!C.stat)
C.emote("scream")
C.emote("scream")
user.changeNext_move(CLICK_CD_MELEE)
if(!(head.status & ORGAN_ROBOT))
C.apply_damage(10, BURN, "head") //30 overall upper body damage because your body was just placed over a hot grill!
if(!(chest.status & ORGAN_ROBOT))
C.apply_damage(10, BURN, "chest")
if(!(l_arm.status & ORGAN_ROBOT))
C.apply_damage(5, BURN, "l_arm")
if(!(r_arm.status & ORGAN_ROBOT))
C.apply_damage(5, BURN, "r_arm")
add_logs(G.assailant, G.affecting, "burns on a grill")
C.adjustFireLoss(30)
add_logs(user, G.affecting, "burns on a grill")
qdel(G) //Removes the grip to prevent rapid sears and give you a chance to run
return 1
else
to_chat(user, "<span class='warning'>You can only harm carbon-based creatures this way!</span>")
return 0
code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+1 -1
View File
@@ -169,7 +169,7 @@
interact(user)
/obj/machinery/kitchen_machine/proc/special_attack(obj/item/weapon/grab/G, mob/user)
to_chat(user, "<span class='alert'>This is ridiculous. You can not fit \the [G.affecting] in this [src].</span>")
to_chat(user, "<span class='alert'>This is ridiculous. You can not fit [G.affecting] in this [src].</span>")
return 0
/********************
code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
+3 -5
View File
@@ -45,7 +45,7 @@
efficiency = round((E/2), 1) // There's 2 lasers, so halve the effect on the efficiency to keep it balanced
/obj/machinery/kitchen_machine/oven/special_attack(obj/item/weapon/grab/G, mob/user)
if(istype(G.affecting, /mob/living/carbon/human))
if(ishuman(G.affecting))
if(G.state < GRAB_AGGRESSIVE)
to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
return 1
@@ -56,16 +56,14 @@
return 1
C.visible_message("<span class='danger'>[user] bashes [C]'s head in [src]'s door!</span>", \
"<span class='userdanger'>[user] bashes your head in [src]'s door! It feels rather hot in the oven!</span>")
if(!C.stat)
C.emote("scream")
C.emote("scream")
user.changeNext_move(CLICK_CD_MELEE)
if(!(head.status & ORGAN_ROBOT))
C.apply_damage(5, BURN, "head") //5 fire damage, 15 brute damage, and weakening because your head was just in a hot oven with the door bashing into your neck!
C.apply_damage(15, BRUTE, "head")
C.Weaken(2)
add_logs(G.assailant, G.affecting, "head smashed in oven")
add_logs(user, G.affecting, "head smashed in oven")
qdel(G) //Removes the grip to prevent rapid bashes. With the weaken, you PROBABLY can't run unless they are slow to grab you again...
return 1
else
to_chat(user, "<span class='warning'>You can only harm carbon-based creatures this way!</span>")
return 0