Skip to content

Commit

Permalink
imageadd: new beans sprite & new plasmaman plushies (#6223)
Browse files Browse the repository at this point in the history
  • Loading branch information
NightDawnFox authored Dec 21, 2024
1 parent 16abd3e commit 1cfc10c
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 4 deletions.
56 changes: 53 additions & 3 deletions code/game/objects/items/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@
icon_state = "redfox"

/obj/random/plushie/item_to_spawn()
return pick(subtypesof(/obj/item/toy/plushie) - typesof(/obj/item/toy/plushie/fluff)) //exclude the base type.
return pick(subtypesof(/obj/item/toy/plushie) - typesof(/obj/item/toy/plushie/fluff) - subtypesof(/obj/item/toy/plushie/plasmamanplushie/standart)) //exclude the base type and 11 random plasma plushies

/obj/item/toy/plushie/corgi
name = "corgi plushie"
Expand Down Expand Up @@ -1282,11 +1282,61 @@
/obj/item/toy/plushie/plasmamanplushie
name = "plasmaman plushie"
desc = "A stuffed toy that resembles your purple coworkers. Mmm, yeah, in true plasmaman fashion, it's not cute at all despite the designer's best efforts."
icon_state = "plushie_pman"
icon_state = "plasmaman_plushie_civillian"
attack_verb = list("burns", "space beasts", "fwooshes")
var/pmanlbite = 'sound/effects/extinguish.ogg'
var/cooldown = FALSE

/obj/item/toy/plushie/plasmamanplushie/random/Initialize(mapload)
. = ..()
var/choice = pick(subtypesof(/obj/item/toy/plushie/plasmamanplushie/standart))
new choice(loc)
return INITIALIZE_HINT_QDEL


/obj/item/toy/plushie/plasmamanplushie/standart/sindie
name = "syndicate plasmaman plushie"
icon_state = "plasmaman_plushie_syndicomm"

/obj/item/toy/plushie/plasmamanplushie/standart/doctor
name = "medical doctor plasmaman plushie"
icon_state = "plasmaman_plushie_doctor"

/obj/item/toy/plushie/plasmamanplushie/standart/brigmed
name = "brig physician plasmaman plushie"
icon_state = "plasmaman_plushie_brigphysician"

/obj/item/toy/plushie/plasmamanplushie/standart/chemist
name = "chemist plasmaman plushie"
icon_state = "plasmaman_plushie_chemist"

/obj/item/toy/plushie/plasmamanplushie/standart/scientist
name = "scientist plasmaman plushie"
icon_state = "plasmaman_plushie_scientist"

/obj/item/toy/plushie/plasmamanplushie/standart/engineer
name = "station engineer plasmaman plushie"
icon_state = "plasmaman_plushie_engineer"

/obj/item/toy/plushie/plasmamanplushie/standart/atmostech
name = "atmospheric technician plasmaman plushie"
icon_state = "plasmaman_plushie_atmostech"

/obj/item/toy/plushie/plasmamanplushie/standart/officer
name = "security officer plasmaman plushie"
icon_state = "plasmaman_plushie_officer"

/obj/item/toy/plushie/plasmamanplushie/standart/captain
name = "captain plasmaman plushie"
icon_state = "plasmaman_plushie_captain"

/obj/item/toy/plushie/plasmamanplushie/standart/ntr
name = "nanotrasen representative plasmaman plushie"
icon_state = "plasmaman_plushie_ntr"

/obj/item/toy/plushie/plasmamanplushie/standart/miner
name = "shaft miner plasmaman plushie"
icon_state = "plasmaman_plushie_shaftminer"

/obj/item/toy/plushie/plasmamanplushie/attack(mob/living/target, mob/living/user, params, def_zone, skip_attack_anim = FALSE)
. = ..()
Expand All @@ -1299,7 +1349,7 @@
return ..()

playsound(src, 'sound/effects/extinguish.ogg', 20, 0)
visible_message("<span class='danger'>Plasmaflood!</span>")
visible_message("<span class='danger'>Plasssma iss Eternal!</span>")
cooldown = TRUE
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 3 SECONDS)

Expand Down
19 changes: 18 additions & 1 deletion code/modules/client/preference/loadout/loadout_plushie.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,26 @@
path = /obj/item/toy/plushie/greyplushie

/datum/gear/plushie/plasmamanplushie
display_name = "Plasmaman Plushie"
display_name = "Plasmaman Plushie, select"
path = /obj/item/toy/plushie/plasmamanplushie

/datum/gear/plushie/plasmamanplushie/New()
..()
var/list/plasmamans = list(/obj/item/toy/plushie/plasmamanplushie,
/obj/item/toy/plushie/plasmamanplushie/standart/sindie,
/obj/item/toy/plushie/plasmamanplushie/standart/doctor,
/obj/item/toy/plushie/plasmamanplushie/standart/brigmed,
/obj/item/toy/plushie/plasmamanplushie/standart/chemist,
/obj/item/toy/plushie/plasmamanplushie/standart/scientist,
/obj/item/toy/plushie/plasmamanplushie/standart/engineer,
/obj/item/toy/plushie/plasmamanplushie/standart/atmostech,
/obj/item/toy/plushie/plasmamanplushie/standart/officer,
/obj/item/toy/plushie/plasmamanplushie/standart/captain,
/obj/item/toy/plushie/plasmamanplushie/standart/ntr,
/obj/item/toy/plushie/plasmamanplushie/standart/miner,
)
gear_tweaks += new /datum/gear_tweak/path(plasmamans, src, TRUE)

/datum/gear/plushie/shardplushie
display_name = "Shard Plushie"
path = /obj/item/toy/plushie/shardplushie
Expand Down
Binary file modified icons/obj/food/food.dmi
Binary file not shown.
Binary file modified icons/obj/toy.dmi
Binary file not shown.

0 comments on commit 1cfc10c

Please sign in to comment.