Skip to content

Commit

Permalink
Icon Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
InsightfulParasite committed Nov 18, 2023
1 parent 63ff76a commit 844732d
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 7 deletions.
Binary file modified ModularTegustation/Teguicons/48x48.dmi
Binary file not shown.
Binary file modified ModularTegustation/Teguicons/48x96.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@
datum_reference.qliphoth_change(-1)

if((get_attribute_level(user, TEMPERANCE_ATTRIBUTE) < 40) && !(GODMODE in user.status_flags))
icon_state = "ladyfacingthewall_active"
flick("ladyfacingthewall_active", src)
user.adjustSanityLoss(user.maxSanity)
user.apply_status_effect(/datum/status_effect/panicked_lvl_4)
sleep(10)
icon_state = "ladyfacingthewall"
return
45 changes: 41 additions & 4 deletions code/modules/mob/living/simple_animal/abnormality/waw/generalb.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/mob/living/simple_animal/hostile/abnormality/general_b
name = "General Bee"
desc = "A bee humanoid creature."
icon = 'ModularTegustation/Teguicons/48x96.dmi'
icon = 'ModularTegustation/Teguicons/48x48.dmi'
icon_state = "generalbee"
icon_living = "generalbee"
speak_emote = list("buzzes")
Expand Down Expand Up @@ -38,6 +38,8 @@
var/fire_cooldown
var/fireball_range = 30
var/volley_count
//If the general has her post breach icon.
var/static/true_breached = FALSE

/mob/living/simple_animal/hostile/abnormality/general_b/NeutralEffect(mob/living/carbon/human/user, work_type, pe)
if(prob(40))
Expand All @@ -60,13 +62,47 @@
datum_reference.qliphoth_change(1)
return

//Egor requested i make this an override of general bee rather than a alteration of the root. -IP
/mob/living/simple_animal/hostile/abnormality/general_b/BreachEffect(mob/living/carbon/human/user, breach_type = BREACH_NORMAL)
..()
//Run icon change proc.
update_icon()

/mob/living/simple_animal/hostile/abnormality/general_b/update_icon_state()
icon = initial(icon)
if(status_flags & GODMODE)
// Not breaching
//Normal bee or one eyed bee.
if(true_breached)
icon_living = "punished_bee"
else
icon_living = "generalbee"

else if(stat == DEAD)
icon_state = icon_dead
return
else
icon = 'ModularTegustation/Teguicons/48x96.dmi'
icon_living = "general_breach"
icon_state = icon_living

/mob/living/simple_animal/hostile/abnormality/general_b/Life()
. = ..()
if(!.) // Dead
return FALSE
if((fire_cooldown < world.time))
fireshell()

//Prevents special armor drop if not breached.
/mob/living/simple_animal/hostile/abnormality/general_b/drop_loot()
if(status_flags & GODMODE)
return
..()

/mob/living/simple_animal/hostile/abnormality/general_b/PostSpawn()
..()
update_icon()

/mob/living/simple_animal/hostile/abnormality/general_b/proc/fireshell()
fire_cooldown = world.time + fire_cooldown_time
var/list/targets = list()
Expand All @@ -87,13 +123,14 @@
fire_cooldown = world.time + fire_cooldown_time*3 //Triple cooldown every 4 shells

/mob/living/simple_animal/hostile/abnormality/general_b/BreachEffect()
icon_state = "generalbee_breach"
addtimer(CALLBACK(GLOBAL_PROC, .proc/show_global_blurb, 5 SECONDS, "My queen? I hear your cries...", 25))
icon = 'ModularTegustation/Teguicons/48x96.dmi'
flick("generalbee_", src)
SLEEP_CHECK_DEATH(80)
var/turf/T = pick(GLOB.department_centers)
forceMove(T)
icon_living = "general_breach"
icon_state = icon_living
update_icon()
true_breached = TRUE
var/turf/orgin = get_turf(src)
var/list/all_turfs = RANGE_TURFS(2, orgin)
for(var/turf/Y in all_turfs)
Expand Down

0 comments on commit 844732d

Please sign in to comment.