From a521f88e95bc8f482a8e86f4477352881b0d79f0 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Fri, 23 May 2014 01:15:24 -0400 Subject: [PATCH] Final dodgeball fixes --- code/modules/admin/verbs/onlyoneteam.dm | 2 +- code/modules/clothing/under/color.dm | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm index 8c5e4b8362f..c7b6c5d3741 100644 --- a/code/modules/admin/verbs/onlyoneteam.dm +++ b/code/modules/admin/verbs/onlyoneteam.dm @@ -63,7 +63,7 @@ name = "dodgeball" icon = 'icons/obj/basketball.dmi' icon_state = "dodgeball" - item_state = "dodgeball" + item_state = "basketball" desc = "Used for playing the most violent and degrading of childhood games." /obj/item/weapon/beach_ball/dodgeball/throw_impact(atom/hit_atom) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 5f01b9d526a..5b7aa5362ca 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -19,6 +19,9 @@ _color = "blue" flags = FPRINT | TABLEPASS | ONESIZEFITSALL +/obj/item/clothing/under/color/blue/dodgeball + canremove = 0 + /obj/item/clothing/under/color/green name = "green jumpsuit" icon_state = "green" @@ -58,6 +61,9 @@ _color = "red" flags = FPRINT | TABLEPASS | ONESIZEFITSALL +/obj/item/clothing/under/color/red/dodgeball + canremove = 0 + /obj/item/clothing/under/color/white name = "white jumpsuit" icon_state = "white"