From 86b584fab5591d9e65908ea85fa90bac64d1d773 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sat, 21 Nov 2020 21:08:55 -0700
Subject: [PATCH] typos
---
code/__DEFINES/mobs/innate_abilities.dm | 2 +-
code/modules/mob/innate_abilities.dm | 2 +-
.../carbon/human/innate_abilities/blobform.dm | 6 +++---
.../carbon/human/innate_abilities/customization.dm | 4 ++--
.../carbon/human/species_types/jellypeople.dm | 13 -------------
5 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/code/__DEFINES/mobs/innate_abilities.dm b/code/__DEFINES/mobs/innate_abilities.dm
index 563a48deec..d2d3dbbc67 100644
--- a/code/__DEFINES/mobs/innate_abilities.dm
+++ b/code/__DEFINES/mobs/innate_abilities.dm
@@ -25,5 +25,5 @@
/// limb regrowth usage type
#define PROPERTY_LIMB_REGROWTH_USAGE_TYPE "cost"
/// blood
- #define REGRWOTH_USES_BLOOD "blood"
+ #define REGROWTH_USES_BLOOD "blood"
diff --git a/code/modules/mob/innate_abilities.dm b/code/modules/mob/innate_abilities.dm
index 2c77d9c64c..df80cea98c 100644
--- a/code/modules/mob/innate_abilities.dm
+++ b/code/modules/mob/innate_abilities.dm
@@ -12,7 +12,7 @@
/mob/proc/get_ability_property(ability, property)
return ability_properties && ability_properties[ability] && ability_properties[ability][property]
-GLOBAL_LIST_INIT(innate_ability_typepaths, all_innate_ability_typepaths)
+GLOBAL_LIST_INIT(innate_ability_typepaths, all_innate_ability_typepaths())
/proc/all_innate_ability_typepaths()
return list(
diff --git a/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm b/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm
index df67f8b54d..101e19f9aa 100644
--- a/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm
+++ b/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm
@@ -13,7 +13,7 @@
var/puddle_from_effect = /obj/effect/temp_visual/slime_puddle/reverse
var/puddle_icon = 'icons/mob/mob.dmi'
var/puddle_state = "puddle"
- var/tracked_overlay
+ var/mutable_appearance/tracked_overlay
var/datum/component/squeak/squeak
var/transforming = FALSE
var/last_use
@@ -39,7 +39,7 @@
if(IsAvailable())
transforming = TRUE
UpdateButtonIcon()
- var/mutcolor = get_ability_property(INNATE_ABILITY_SLIME_BLOBFORM, PROPERTY_BLOFMROM_COLOR) || ("#" + H.dna.features["mcolor"])
+ var/mutcolor = owner.get_ability_property(INNATE_ABILITY_SLIME_BLOBFORM, PROPERTY_BLOBFORM_COLOR) || ("#" + H.dna.features["mcolor"])
if(!is_puddle)
if(CHECK_MOBILITY(H, MOBILITY_USE)) //if we can use items, we can turn into a puddle
is_puddle = TRUE //so we know which transformation to use when its used
@@ -88,7 +88,7 @@
//like the above, but reverse everything done!
H.cut_overlay(tracked_overlay)
var/obj/effect/puddle_effect = new puddle_from_effect(get_turf(owner), owner.dir)
- puddle_effect.color = mutcolor
+ puddle_effect.color = tracked_overlay.color
H.Stun(out_transformation_duration, ignore_canstun = TRUE)
sleep(out_transformation_duration)
REMOVE_TRAIT(H, TRAIT_PARALYSIS_L_ARM, SLIMEPUDDLE_TRAIT)
diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm
index e1af0f53e2..363f6ecbb2 100644
--- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm
+++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm
@@ -6,7 +6,7 @@
background_icon_state = "bg_alien"
/datum/action/innate/ability/humanoid_customization/Activate()
- if(owner.get_ability_property(INNATE_ABILITY_HUMANOID_CUSTOMIZATION, ABILITY_CUSTOMIZATION_SILENT))
+ if(owner.get_ability_property(INNATE_ABILITY_HUMANOID_CUSTOMIZATION, PROPERTY_CUSTOMIZATION_SILENT))
owner.visible_message("[owner] gains a look of \
concentration while standing perfectly still.\
Their body seems to shift and starts getting more goo-like.",
@@ -20,7 +20,7 @@
///// maybe just make this entire thing tgui based. maybe.
///////
-/datum/action/innate/slime_change/proc/change_form()
+/datum/action/innate/ability/humanoid_customization/proc/change_form()
var/mob/living/carbon/human/H = owner
var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Body Color","Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel")
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index c369625dc6..3ead134ce4 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -15,9 +15,6 @@
exotic_bloodtype = "GEL"
exotic_blood_color = "BLOOD_COLOR_SLIME"
damage_overlay_type = ""
- var/datum/action/innate/regenerate_limbs/regenerate_limbs
- var/datum/action/innate/slime_change/slime_change
- var/datum/action/innate/slime_puddle/slime_puddle
liked_food = TOXIC | MEAT
disliked_food = null
toxic_food = ANTITOXIC
@@ -37,14 +34,6 @@
icon_state = "brain-slime"
/datum/species/jelly/on_species_loss(mob/living/carbon/C)
- if(slime_puddle && slime_puddle.is_puddle)
- slime_puddle.Activate()
- if(regenerate_limbs)
- regenerate_limbs.Remove(C)
- if(slime_change)
- slime_change.Remove(C)
- if(slime_puddle)
- slime_puddle.Remove(C)
C.faction -= "slime"
if(ishuman(C))
var/mob/living/carbon/human/H = C
@@ -81,8 +70,6 @@
to_chat(H, "You feel drained!")
if(H.blood_volume < (BLOOD_VOLUME_BAD*H.blood_ratio))
Cannibalize_Body(H)
- if(regenerate_limbs)
- regenerate_limbs.UpdateButtonIcon()
/datum/species/jelly/proc/Cannibalize_Body(mob/living/carbon/human/H)
var/list/limbs_to_consume = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) - H.get_missing_limbs()