mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-10 01:34:01 +00:00
Removes the ralsei plushie (#92311)
## About The Pull Request Removes ralsei plushie ## Why It's Good For The Game Its a lazy sprite forced into the game + i killed him https://github.com/user-attachments/assets/a678fa08-0882-4e24-86df-942e7adfda84 ## Changelog 🆑 Ezel del: Removes ralsei plushie /🆑
This commit is contained in:
@@ -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
|
||||
},
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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!"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 17 KiB |
Reference in New Issue
Block a user