diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 6e29288ba67..b48b6f58928 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -523,7 +523,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/south, /obj/item/gift{ - contains_type = /obj/item/toy/plush/goatplushie; + contains_type = /obj/item/toy/plush/beeplushie; pixel_x = 7; pixel_y = 6 }, diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index 33ad9e27df4..33df34dabf6 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -73594,10 +73594,6 @@ /area/station/hallway/primary/central) "vJP" = ( /obj/structure/table, -/obj/item/toy/plush/goatplushie{ - pixel_x = 6; - pixel_y = 13 - }, /obj/item/storage/box/hug/plushes{ pixel_x = -11; pixel_y = 16 diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index 08253111979..0dbe454b5ca 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -56283,10 +56283,6 @@ /turf/open/floor/wood/large, /area/station/commons/dorms) "ipM" = ( -/obj/item/toy/plush/goatplushie{ - name = "Easteria"; - desc = "Despite its cuddly appearance and plush nature, it will... cuddle you up all the same?" - }, /obj/item/staff, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 547f9e55f15..0e8c80097d0 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -53727,7 +53727,6 @@ "rSH" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, /obj/structure/window/spawner/directional/west, -/obj/item/toy/plush/goatplushie, /turf/open/floor/iron/white, /area/station/commons/vacant_room) "rTm" = ( diff --git a/_maps/templates/lazy_templates/ninja_den.dmm b/_maps/templates/lazy_templates/ninja_den.dmm index e2292b5b092..e357077f888 100644 --- a/_maps/templates/lazy_templates/ninja_den.dmm +++ b/_maps/templates/lazy_templates/ninja_den.dmm @@ -1058,7 +1058,6 @@ /area/centcom/central_command_areas/holding) "zU" = ( /obj/structure/table/wood, -/obj/item/toy/plush/goatplushie, /obj/machinery/light/small/directional/north, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) diff --git a/code/_globalvars/arcade.dm b/code/_globalvars/arcade.dm index 9803178a886..281b9b40208 100644 --- a/code/_globalvars/arcade.dm +++ b/code/_globalvars/arcade.dm @@ -54,7 +54,6 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/card/emagfake = 1, /obj/item/clothing/shoes/wheelys = 2, /obj/item/clothing/shoes/kindle_kicks = 2, - /obj/item/toy/plush/goatplushie = 2, /obj/item/toy/plush/moth = 2, /obj/item/toy/plush/pkplush = 2, /obj/item/toy/plush/rouny = 2, diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm index 1d969625811..5c94cb3a0cc 100644 --- a/code/game/objects/effects/spawners/random/entertainment.dm +++ b/code/game/objects/effects/spawners/random/entertainment.dm @@ -277,7 +277,6 @@ /obj/item/toy/plush/carpplushie = 3, /obj/item/toy/plush/lizard_plushie/green = 3, /obj/item/toy/plush/lizard_plushie/space/green = 3, - /obj/item/toy/plush/goatplushie = 3, /obj/item/toy/plush/rouny = 3, /obj/item/toy/plush/abductor = 3, /obj/item/toy/plush/abductor/agent = 3, diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 8fd1f2e5e6b..f733481ae9b 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -675,64 +675,6 @@ gender = FEMALE squeak_override = list('sound/mobs/humanoids/moth/scream_moth.ogg'=1) -/obj/item/toy/plush/goatplushie - name = "strange goat plushie" - icon_state = "goat" - desc = "Despite its cuddly appearance and plush nature, it will beat you up all the same. Goats never change." - squeak_override = list('sound/items/weapons/punch1.ogg'=1) - /// Whether or not this goat is currently taking in a monsterous doink - var/going_hard = FALSE - /// Whether or not this goat has been flattened like a funny pancake - var/splat = FALSE - -/obj/item/toy/plush/goatplushie/Initialize(mapload) - . = ..() - var/static/list/loc_connections = list( - COMSIG_TURF_INDUSTRIAL_LIFT_ENTER = PROC_REF(splat), - ) - AddElement(/datum/element/connect_loc, loc_connections) - -/obj/item/toy/plush/goatplushie/attackby(obj/item/cigarette/rollie/fat_dart, mob/user, list/modifiers, list/attack_modifiers) - if(!istype(fat_dart)) - return ..() - if(splat) - to_chat(user, span_notice("[src] doesn't seem to be able to go hard right now.")) - return - if(going_hard) - to_chat(user, span_notice("[src] is already going too hard!")) - return - if(!fat_dart.lit) - to_chat(user, span_notice("You'll have to light that first!")) - return - to_chat(user, span_notice("You put [fat_dart] into [src]'s mouth.")) - qdel(fat_dart) - going_hard = TRUE - update_icon(UPDATE_OVERLAYS) - -/obj/item/toy/plush/goatplushie/proc/splat(datum/source) - SIGNAL_HANDLER - if(splat) - return - if(going_hard) - going_hard = FALSE - update_icon(UPDATE_OVERLAYS) - icon_state = "goat_splat" - playsound(src, SFX_DESECRATION, 50, TRUE) - visible_message(span_danger("[src] gets absolutely flattened!")) - splat = TRUE - -/obj/item/toy/plush/goatplushie/examine() - . = ..() - if(splat) - . += span_notice("[src] might need medical attention.") - if(going_hard) - . += span_notice("[src] is going so hard, feel free to take a picture.") - -/obj/item/toy/plush/goatplushie/update_overlays() - . = ..() - if(going_hard) - . += "goat_dart" - /obj/item/toy/plush/moth name = "moth plushie" desc = "A plushie depicting an adorable mothperson. It's a huggable bug!" diff --git a/icons/obj/toys/plushes.dmi b/icons/obj/toys/plushes.dmi index 697a537a32e..a8a0bee7f5c 100644 Binary files a/icons/obj/toys/plushes.dmi and b/icons/obj/toys/plushes.dmi differ