mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-22 04:24:20 +01:00
[FIX] Borg hat fixes (#24547)
* Borg hats fixes * Update code/modules/mob/living/silicon/silicon_defense.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> --------- Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
This commit is contained in:
@@ -596,9 +596,6 @@
|
||||
drop_hat()
|
||||
. = ..()
|
||||
|
||||
/mob/living/silicon/grabbedby(mob/living/user)
|
||||
remove_from_head(user)
|
||||
|
||||
/mob/living/silicon/examine(mob/user)
|
||||
. = ..()
|
||||
if(silicon_hat)
|
||||
|
||||
@@ -1703,11 +1703,3 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
|
||||
old_ai.connected_robots -= src
|
||||
if(connected_ai)
|
||||
connected_ai.connected_robots |= src
|
||||
|
||||
/datum/emote/flip/run_emote(mob/user, params, type_override, intentional)
|
||||
. = ..()
|
||||
if(isrobot(user))
|
||||
var/mob/living/silicon/robot/borg = user
|
||||
if(borg.drop_hat())
|
||||
borg.visible_message("<span class='warning'><span class='name'>[src]</span> drops their hat!</span>",
|
||||
"<span class='warning'>Your hat falls off!</span>")
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/mob/living/silicon/grabbedby(mob/living/user)
|
||||
return
|
||||
remove_from_head(user)
|
||||
|
||||
/mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M)
|
||||
if(..()) //if harm or disarm intent
|
||||
|
||||
@@ -159,6 +159,12 @@
|
||||
|
||||
user.SpinAnimation(5, 1)
|
||||
|
||||
if(isrobot(user))
|
||||
var/mob/living/silicon/robot/borg = user
|
||||
if(borg.drop_hat())
|
||||
borg.visible_message("<span class='warning'><span class='name'>[user]</span> drops their hat!</span>",
|
||||
"<span class='warning'>As you flip your hat falls off!</span>")
|
||||
|
||||
if(prob(5) && ishuman(user))
|
||||
message = "attempts a flip and crashes to the floor!"
|
||||
sleep(0.3 SECONDS)
|
||||
|
||||
Reference in New Issue
Block a user