Skip to content

Commit

Permalink
Xenobio armblade text change + minor changeling fix (#22782)
Browse files Browse the repository at this point in the history
* Update mutations.dm

* May have forgotten about that one
  • Loading branch information
Oblisk234 authored Nov 10, 2024
1 parent 6fe0601 commit 7ccf93c
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions code/modules/antagonists/changeling/powers/mutations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

/datum/action/changeling/weapon/proc/check_weapon(mob/user, obj/item/hand_item)
if(istype(hand_item, weapon_type))
if(istype(hand_item, /obj/item/melee/arm_blade/slime))
return
user.temporarilyRemoveItemFromInventory(hand_item, TRUE) //DROPDEL will delete the item
if(!silent)
playsound(user, 'sound/effects/blobattack.ogg', 30, TRUE)
Expand Down Expand Up @@ -206,13 +208,19 @@
return

if(A.hasPower())
user.visible_message(span_warning("[user] jams [src] into the airlock and starts prying it open!"), span_warning("We start forcing the airlock open."), //yogs modified description
if(istype(src, /obj/item/melee/arm_blade/slime))
user.visible_message(span_warning("[user] jams [src] into the airlock and starts prying it open!"), span_warning("You start forcing the airlock open."), span_italics("You hear a metal screeching sound."))
else
user.visible_message(span_warning("[user] jams [src] into the airlock and starts prying it open!"), span_warning("We start forcing the airlock open."), //yogs modified description
span_italics("You hear a metal screeching sound."))
playsound(A, 'sound/machines/airlock_alien_prying.ogg', 100, 1)
if(!do_after(user, 6 SECONDS, A))
return
//user.say("Heeeeeeeeeerrre's Johnny!")
user.visible_message(span_warning("[user] forces the airlock to open with [user.p_their()] [src]!"), span_warning("We force the airlock to open."), //yogs modified description
if(istype(src, /obj/item/melee/arm_blade/slime))
user.visible_message(span_warning("[user] forces the airlock to open with [user.p_their()] [src]!"), span_warning("You force the airlock to open."), span_italics("You hear a metal screeching sound."))
else
user.visible_message(span_warning("[user] forces the airlock to open with [user.p_their()] [src]!"), span_warning("We force the airlock to open."), //yogs modified description
span_italics("You hear a metal screeching sound."))
A.open(2)

Expand Down

0 comments on commit 7ccf93c

Please sign in to comment.