Skip to content

Commit

Permalink
Initial fixes from testing
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreML committed Jan 24, 2024
1 parent f4a153a commit 8ffee8e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
speed = XENO_SPEED_TIER_4

available_strains = list(/datum/xeno_strain/eggsac)
behavior_delegate_type = /datum/behavior_delegate/carrier_base

evolution_allowed = FALSE
deevolves_to = list(XENO_CASTE_DRONE)
Expand Down Expand Up @@ -78,8 +79,6 @@
/mob/living/carbon/xenomorph/proc/set_hugger_reserve_for_morpher,
)

behavior_delegate = /datum/behavior_delegate/carrier_base

icon_xenonid = 'icons/mob/xenonids/carrier.dmi'

weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
speed = XENO_SPEED_TIER_8

available_strains = list(/datum/xeno_strain/watcher)
behavior_delegate_type = /datum/behavior_delegate/facehugger_base

evolution_allowed = FALSE
can_be_revived = FALSE
Expand Down Expand Up @@ -58,8 +59,6 @@
/mob/living/carbon/xenomorph/proc/vent_crawl,
)

behavior_delegate = /datum/behavior_delegate/facehugger_base

icon_xeno = 'icons/mob/xenos/facehugger.dmi'
icon_xenonid = 'icons/mob/xenonids/facehugger.dmi'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,6 @@

var/mutable_appearance/fruit_sac_overlay_icon

/datum/behavior_delegate/drone_gardener/add_to_xeno()
on_update_icons()

/datum/behavior_delegate/drone_gardener/on_update_icons()
if(!fruit_sac_overlay_icon)
fruit_sac_overlay_icon = mutable_appearance('icons/mob/xenos/drone_strain_overlays.dmi', "Gardener Drone Walking")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@
if(!length(caste.available_strains) || !check_state(TRUE))
return FALSE

if(strain)
to_chat(src, SPAN_WARNING("We have already chosen a strain."))
return FALSE

if(is_ventcrawling)
to_chat(src, SPAN_WARNING("This place is too constraining to take a strain."))
return FALSE
Expand Down

0 comments on commit 8ffee8e

Please sign in to comment.