cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Jaws of life tweaks (#19233)

Browse Source 
tweak: jaws of life are normal-sized
tweak: non-engineers take longer to pry open doors with jaws of life
bugfix: fixes not being able to pry open shocked doors with insulated gloves on
This commit is contained in:
SapphicOverload
2023-06-12 15:11:39 -04:00
committed by GitHub
parent cbf94088f8
commit d842cac2f8
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/machinery/doors/airlock.dm
View File

@@ -1277,8 +1277,8 @@
if(istype(I, /obj/item/jawsoflife) || istype(I, /obj/item/mantis/blade)) if(istype(I, /obj/item/jawsoflife) || istype(I, /obj/item/mantis/blade))
if(isElectrified()) if(isElectrified())
shock(user,100)//it's like sticking a fork in a power socket if(shock(user,100))//it's like sticking a fork in a power socket
return return
if(istype(I, /obj/item/mantis/blade)) if(istype(I, /obj/item/mantis/blade))
var/obj/item/mantis/blade/secondsword = user.get_inactive_held_item() var/obj/item/mantis/blade/secondsword = user.get_inactive_held_item()
@@ -1301,7 +1301,7 @@
to_chat(user, span_warning("The airlock won't budge!")) to_chat(user, span_warning("The airlock won't budge!"))
return return
var/time_to_open = 7 SECONDS * I.toolspeed var/time_to_open = 9 SECONDS
if(hasPower() && !prying_so_hard) if(hasPower() && !prying_so_hard)
if (I.tool_behaviour == TOOL_CROWBAR) //we need another check, futureproofing for if/when bettertools actually completely replaces the old jaws if (I.tool_behaviour == TOOL_CROWBAR) //we need another check, futureproofing for if/when bettertools actually completely replaces the old jaws
@@ -1321,10 +1321,10 @@
playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE) //is it aliens or just the CE being a dick? playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE) //is it aliens or just the CE being a dick?
prying_so_hard = TRUE prying_so_hard = TRUE
if(do_after(user, time_to_open, src)) if(I.use_tool(src, user, time_to_open))
open(2)
if(!istype(I,/obj/item/jawsoflife/jimmy)) //You get to be special if(!istype(I,/obj/item/jawsoflife/jimmy)) //You get to be special
take_damage(max_integrity/8) //Forcing open a door messes it up a little take_damage(max_integrity/8, sound_effect = FALSE) //Forcing open a door messes it up a little
open(2)
if(density && !open(2)) if(density && !open(2))
to_chat(user, span_warning("Despite your attempts, [src] refuses to open.")) to_chat(user, span_warning("Despite your attempts, [src] refuses to open."))
prying_so_hard = FALSE prying_so_hard = FALSE

2
code/game/objects/items/mantis.dm
View File

@@ -14,7 +14,7 @@
w_class = WEIGHT_CLASS_NORMAL w_class = WEIGHT_CLASS_NORMAL
sharpness = SHARP_EDGED sharpness = SHARP_EDGED
tool_behaviour = TOOL_CROWBAR // just a very "sharp" crowbar tool_behaviour = TOOL_CROWBAR // just a very "sharp" crowbar
toolspeed = 0.45 //for door prying speed, ends up at about 3 seconds toolspeed = 0.35 //for door prying speed, ends up at about 3 seconds
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "lacerated", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "lacerated", "ripped", "diced", "cut")
/obj/item/mantis/blade/equipped(mob/user, slot, initial) /obj/item/mantis/blade/equipped(mob/user, slot, initial)

2
yogstation/code/game/objects/items/tools.dm
View File

@@ -9,7 +9,6 @@
item_state = "jawsoflife" item_state = "jawsoflife"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
usesound = 'sound/items/jaws_pry.ogg' usesound = 'sound/items/jaws_pry.ogg'
force = 15 force = 15
toolspeed = 0.7 toolspeed = 0.7
@@ -162,6 +161,7 @@
materials = list(MAT_METAL=400,MAT_SILVER=10,MAT_TITANIUM=80) materials = list(MAT_METAL=400,MAT_SILVER=10,MAT_TITANIUM=80)
toolspeed = 0.3 // Starting minimum value. Pump it up by using it up to the max toolspeed = 0.3 // Starting minimum value. Pump it up by using it up to the max
tool_behaviour = TOOL_CROWBAR tool_behaviour = TOOL_CROWBAR
w_class = WEIGHT_CLASS_SMALL
var/pump_charge = 0 var/pump_charge = 0
var/pump_max = 100 var/pump_max = 100
var/pump_min = 0 var/pump_min = 0