cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Removes "strandling" status effect from a bunch of random places / refactors it [MDB IGNORE] (#13480)

Browse Source 
* Removes "strandling" status effect from a bunch of random places / refactors it

* Update carbon_defense.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-05-11 00:35:40 +01:00
committed by GitHub
co-authored by MrMelbert Gandalf
parent 7606c1715e
commit 0228180861
13 changed files with 192 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/tools/crowbar.dm
+2 -9
View File
@@ -140,15 +140,8 @@
user.visible_message(span_notice("[user] cuts [attacked_carbon]'s restraints with [src]!"))
qdel(attacked_carbon.handcuffed)
return
else if(istype(attacked_carbon) && attacked_carbon.has_status_effect(/datum/status_effect/strandling) && tool_behaviour == TOOL_WIRECUTTER)
user.visible_message(span_notice("[user] attempts to cut the durathread strand from around [attacked_carbon]'s neck."))
if(do_after(user, 1.5 SECONDS, attacked_carbon))
user.visible_message(span_notice("[user] succesfully cuts the durathread strand from around [attacked_carbon]'s neck."))
attacked_carbon.remove_status_effect(/datum/status_effect/strandling)
playsound(loc, usesound, 50, TRUE, -1)
return
else
..()
return ..()
/obj/item/crowbar/cyborg
name = "hydraulic crowbar"
code/game/objects/items/tools/wirecutters.dm
+2 -9
View File
@@ -50,15 +50,8 @@
user.visible_message(span_notice("[user] cuts [attacked_carbon]'s restraints with [src]!"))
qdel(attacked_carbon.handcuffed)
return
else if(istype(attacked_carbon) && attacked_carbon.has_status_effect(/datum/status_effect/strandling))
user.visible_message(span_notice("[user] attempts to cut the durathread strand from around [attacked_carbon]'s neck."))
if(do_after(user, 1.5 SECONDS, attacked_carbon))
user.visible_message(span_notice("[user] succesfully cuts the durathread strand from around [attacked_carbon]'s neck."))
attacked_carbon.remove_status_effect(/datum/status_effect/strandling)
playsound(loc, usesound, 50, TRUE, -1)
return
else
..()
return ..()
/obj/item/wirecutters/suicide_act(mob/user)
user.visible_message(span_suicide("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))