Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/forest/pred/recovery' into fores…
Browse files Browse the repository at this point in the history
…t/pred/recovery
  • Loading branch information
realforest2001 committed Jun 9, 2023
2 parents bb8ebe0 + 65f923a commit 3198a9f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/items/explosives/plastic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,11 @@

/obj/item/explosive/plastic/breaching_charge/can_place(mob/user, atom/target)
if(!is_type_in_list(target, breachable))//only items on the list are allowed
to_chat(user, SPAN_WARNING("You cannot plant \the [name] on \the [target]!"))
to_chat(user, SPAN_WARNING("You cannot plant [name] on [target]!"))
return FALSE

if(SSinterior.in_interior(target))// vehicle checks again JUST IN CASE
to_chat(user, SPAN_WARNING("It's too cramped in here to deploy \the [src]."))
to_chat(user, SPAN_WARNING("It's too cramped in here to deploy [src]."))
return FALSE

if(istype(target, /obj/structure/window))//no breaching charges on the briefing windows / brig / CIC e.e
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_preds/yaut_shield.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
/obj/item/weapon/shield/riot/yautja/attackby(obj/item/object, mob/user)
if(cooldown < world.time - 25)
if(istype(object, /obj/item/weapon) && (object.flags_item & ITEM_PREDATOR))
user.visible_message(SPAN_WARNING("[user] bashes \the [src] with \the [object]!"))
user.visible_message(SPAN_WARNING("[user] bashes [src] with [object]!"))
playsound(user.loc, 'sound/effects/shieldbash.ogg', 25, 1)
cooldown = world.time
else
Expand Down

0 comments on commit 3198a9f

Please sign in to comment.