mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-22 04:28:33 +01:00
Merge branch 'master' into Arokha/matdefs
This commit is contained in:
@@ -2121,7 +2121,7 @@ Departamental Swimsuits, for general use
|
||||
user.visible_message("<span class='notice'>[user] harmlessly bops [target] with \the [src].</span>", \
|
||||
"<span class='notice'>\The [src] harmlessly bops [target]. The hat seems... unwilling?</span>")
|
||||
else
|
||||
user.visible_message("<span class='notice'>\The [src] flops over [user]'s' head for a moment, but they seem alright.</span>", \
|
||||
user.visible_message("<b>\The [src]</b> flops over [user]'s' head for a moment, but they seem alright.", \
|
||||
"<span class='notice'>\The [src] flops over your head for a moment, but you correct it without issue. There we go!</span>")
|
||||
|
||||
/obj/item/clothing/head/fluff/nikki/proc/hat_warp_checks(var/mob/living/target, mob/user, proximity_flag)
|
||||
|
||||
Reference in New Issue
Block a user