Migrates bedsheets, bedsheet bins, beachballs, baseballs, basketballs, and banhammers to the new attack chain (#30170)

* bedsheet

* click tweak
This commit is contained in:
Contrabang
2025-08-22 14:30:29 +00:00
committed by GitHub
parent fbf184a20c
commit b2e6789f5a
3 changed files with 39 additions and 25 deletions
+4 -1
View File
@@ -7,10 +7,13 @@
throw_speed = 1
throw_range = 20
flags = CONDUCT
new_attack_chain = TRUE
/// Whether `attack_self` will move ("dribble") it to the other hand
var/dribbleable = FALSE // Most balls do not have a dribble animation
/obj/item/beach_ball/attack_self__legacy__attackchain(mob/user)
/obj/item/beach_ball/activate_self(mob/user)
if(..())
return
if(!dribbleable)
return
+11 -4
View File
@@ -13,15 +13,22 @@
attack_verb = list("banned")
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
new_attack_chain = TRUE
/obj/item/banhammer/suicide_act(mob/user)
visible_message("<span class='suicide'>[user] is hitting [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to ban [user.p_themselves()] from life.</span>")
return BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS
/obj/item/banhammer/attack__legacy__attackchain(mob/M, mob/user)
to_chat(M, "<font color='red'><b> You have been banned FOR NO REISIN by [user]<b></font>")
to_chat(user, "<font color='red'> You have <b>BANNED</b> [M]</font>")
playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much
/obj/item/banhammer/pre_attack(atom/A, mob/living/user, params)
if(..())
return FINISH_ATTACK
if(ismob(A))
user.changeNext_move(CLICK_CD_MELEE)
to_chat(A, "<font color='red'><b>You have been banned FOR NO REISIN by [user]<b></font>")
to_chat(user, "<font color='red'>You have <b>BANNED</b> [A]</font>")
playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much
return FINISH_ATTACK
/obj/item/sord
name = "\improper SORD"