Skip to content

Commit

Permalink
Wellcheers Glowup (vlggms#1595)
Browse files Browse the repository at this point in the history
* Wellcheers Glowup

* swaps return for continue

* list update
  • Loading branch information
TaculoTaculo authored Nov 8, 2023
1 parent e018bf6 commit e2bf57d
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 2 deletions.
Binary file modified ModularTegustation/Teguicons/32x32.dmi
Binary file not shown.
Binary file modified ModularTegustation/Teguicons/tegumobs.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,26 @@
harvest_phrase = span_notice("The machine dispenses some clear-ish soda into %VESSEL.")
harvest_phrase_third = "%PERSON holds up %VESSEL and lets %ABNO dispense some clear-ish soda into it."

var/list/side_shrimps = list()

/mob/living/simple_animal/hostile/abnormality/wellcheers/PostSpawn()
..()
for(var/d in list(EAST, WEST))
var/turf/TF = get_step(src, d)
if(!istype(TF))
continue
if(!TF.is_blocked_turf(TRUE))
if(locate(/obj/structure/wellcheers_side_shrimp) in TF)
continue
var/obj/structure/wellcheers_side_shrimp/shrimp = new(TF)
side_shrimps += shrimp

/mob/living/simple_animal/hostile/abnormality/wellcheers/Destroy()
for(var/shrimp in side_shrimps)
qdel(shrimp)
side_shrimps = null
..()

/mob/living/simple_animal/hostile/abnormality/wellcheers/SuccessEffect(mob/living/carbon/human/user, work_type, pe)
var/obj/item/dropped_can
switch(work_type)
Expand All @@ -39,16 +59,21 @@
dropped_can = /obj/item/reagent_containers/food/drinks/soda_cans/wellcheers_purple
if(!dropped_can)
return
var/turf/dispense_turf = get_step(src, pick(1,2,4,5,6,8,9,10))
var/turf/dispense_turf = get_step(src, pick(NORTH, SOUTH, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
dropped_can = new dropped_can(dispense_turf)
playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE)
visible_message(span_notice("[src] dispenses [dropped_can]."))
return

// Death!
/mob/living/simple_animal/hostile/abnormality/wellcheers/FailureEffect(mob/living/carbon/human/user, work_type, pe)
// Visual effects
for(var/obj/structure/wellcheers_side_shrimp/shrimp in side_shrimps)
shrimp.ShrimpDance()
for(var/turf/open/T in view(7, src))
new /obj/effect/temp_visual/water_waves(T)

// Actual effects
playsound(get_turf(src), 'sound/abnormalities/wellcheers/ability.ogg', 75, 0)
to_chat(user, span_userdanger("You feel sleepy..."))
user.AdjustSleeping(10 SECONDS)
Expand All @@ -59,7 +84,6 @@
animate(user, alpha = 255, time = 0 SECONDS)
return


// Soda cans
/obj/item/reagent_containers/food/drinks/soda_cans/wellcheers_red
name = "can of cherry 'Wellcheers' soda"
Expand Down Expand Up @@ -129,3 +153,18 @@
/obj/effect/landmark/shrimpship
name = "shrimp ship"
icon_state = "carp_spawn"

// Wellcheers Side Shrimps
/obj/structure/wellcheers_side_shrimp
name = "wellcheers shrimp"
desc = "A peppy shrimp accompanying the soda machine, it seems friendly."
icon = 'ModularTegustation/Teguicons/32x32.dmi'
icon_state = "wellcheers_sideshrimp"
anchored = TRUE
density = TRUE
layer = ABOVE_MOB_LAYER
plane = FLOOR_PLANE
resistance_flags = INDESTRUCTIBLE

/obj/structure/wellcheers_side_shrimp/proc/ShrimpDance()
flick("wellcheers_kidnap",src)

0 comments on commit e2bf57d

Please sign in to comment.