diff --git a/code/datums/embedding_behavior.dm b/code/datums/embedding_behavior.dm index 5579e5dbf8..60398b833f 100644 --- a/code/datums/embedding_behavior.dm +++ b/code/datums/embedding_behavior.dm @@ -1,4 +1,4 @@ -#define EMBEDID "embed-[embed_chance]-[embedded_fall_chance]-[embedded_pain_chance]-[embedded_pain_multiplier]-[embedded_fall_pain_multiplier]-[embedded_impact_pain_multiplier]-[embedded_unsafe_removal_pain_multiplier]-[embedded_unsafe_removal_time]-[ignore_throwspeed_threshold]" +#define EMBEDID "embed-[embed_chance]-[embedded_fall_chance]-[embedded_pain_chance]-[embedded_pain_multiplier]-[embedded_fall_pain_multiplier]-[embedded_impact_pain_multiplier]-[embedded_unsafe_removal_pain_multiplier]-[embedded_unsafe_removal_time]-[embedded_ignore_throwspeed_threshold]" /proc/getEmbeddingBehavior(embed_chance = EMBED_CHANCE, embedded_fall_chance = EMBEDDED_ITEM_FALLOUT, @@ -8,10 +8,10 @@ embedded_impact_pain_multiplier = EMBEDDED_IMPACT_PAIN_MULTIPLIER, embedded_unsafe_removal_pain_multiplier = EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER, embedded_unsafe_removal_time = EMBEDDED_UNSAFE_REMOVAL_TIME, - ignore_throwspeed_threshold = FALSE) + embedded_ignore_throwspeed_threshold = FALSE) . = locate(EMBEDID) if (!.) - . = new /datum/embedding_behavior(embed_chance, embedded_fall_chance, embedded_pain_chance, embedded_pain_multiplier, embedded_fall_pain_multiplier, embedded_impact_pain_multiplier, embedded_unsafe_removal_pain_multiplier, embedded_unsafe_removal_time, ignore_throwspeed_threshold) + . = new /datum/embedding_behavior(embed_chance, embedded_fall_chance, embedded_pain_chance, embedded_pain_multiplier, embedded_fall_pain_multiplier, embedded_impact_pain_multiplier, embedded_unsafe_removal_pain_multiplier, embedded_unsafe_removal_time, embedded_ignore_throwspeed_threshold) /datum/embedding_behavior var/embed_chance @@ -22,7 +22,7 @@ var/embedded_impact_pain_multiplier //The coefficient of multiplication for the damage this item does when first embedded (this*w_class) var/embedded_unsafe_removal_pain_multiplier //The coefficient of multiplication for the damage removing this without surgery causes (this*w_class) var/embedded_unsafe_removal_time //A time in ticks, multiplied by the w_class. - var/ignore_throwspeed_threshold //Does it ignore throwspeed requirements to embed? + var/embedded_ignore_throwspeed_threshold //Does it ignore throwspeed requirements to embed? /datum/embedding_behavior/New(embed_chance = EMBED_CHANCE, embedded_fall_chance = EMBEDDED_ITEM_FALLOUT, @@ -32,7 +32,7 @@ embedded_impact_pain_multiplier = EMBEDDED_IMPACT_PAIN_MULTIPLIER, embedded_unsafe_removal_pain_multiplier = EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER, embedded_unsafe_removal_time = EMBEDDED_UNSAFE_REMOVAL_TIME, - ignore_throwspeed_threshold = FALSE) + embedded_ignore_throwspeed_threshold = FALSE) src.embed_chance = embed_chance src.embedded_fall_chance = embedded_fall_chance src.embedded_pain_chance = embedded_pain_chance @@ -41,10 +41,10 @@ src.embedded_impact_pain_multiplier = embedded_impact_pain_multiplier src.embedded_unsafe_removal_pain_multiplier = embedded_unsafe_removal_pain_multiplier src.embedded_unsafe_removal_time = embedded_unsafe_removal_time - src.ignore_throwspeed_threshold = ignore_throwspeed_threshold + src.embedded_ignore_throwspeed_threshold = embedded_ignore_throwspeed_threshold tag = EMBEDID -/datum/embedding_behavior/proc/setRating(embed_chance, embedded_fall_chance, embedded_pain_chance, embedded_pain_multiplier, embedded_fall_pain_multiplier, embedded_impact_pain_multiplier, embedded_unsafe_removal_pain_multiplier, embedded_unsafe_removal_time, ignore_throwspeed_threshold) +/datum/embedding_behavior/proc/setRating(embed_chance, embedded_fall_chance, embedded_pain_chance, embedded_pain_multiplier, embedded_fall_pain_multiplier, embedded_impact_pain_multiplier, embedded_unsafe_removal_pain_multiplier, embedded_unsafe_removal_time, embedded_ignore_throwspeed_threshold) return getEmbeddingBehavior((isnull(embed_chance) ? src.embed_chance : embed_chance),\ (isnull(embedded_fall_chance) ? src.embedded_fall_chance : embedded_fall_chance),\ (isnull(embedded_pain_chance) ? src.embedded_pain_chance : embedded_pain_chance),\ @@ -53,6 +53,6 @@ (isnull(embedded_impact_pain_multiplier) ? src.embedded_impact_pain_multiplier : embedded_impact_pain_multiplier),\ (isnull(embedded_unsafe_removal_pain_multiplier) ? src.embedded_unsafe_removal_pain_multiplier : embedded_unsafe_removal_pain_multiplier),\ (isnull(embedded_unsafe_removal_time) ? src.embedded_unsafe_removal_time : embedded_unsafe_removal_time),\ - (isnull(ignore_throwspeed_threshold) ? src.ignore_throwspeed_threshold : ignore_throwspeed_threshold)) + (isnull(embedded_ignore_throwspeed_threshold) ? src.embedded_ignore_throwspeed_threshold : embedded_ignore_throwspeed_threshold)) #undef EMBEDID