bunch of issues (#17900)

* bunch of issues

* .

* fix those properly

* safety else none at all

* .

* workaround for a byond bug

* .

* invis robot weapons

* light needs to be reset

* .

* use proper datums

* fix sorting here

* only store non vital

* .

* Update organ_external.dm
This commit is contained in:
Kashargul
2025-06-25 23:39:44 -07:00
committed by GitHub
parent 2a47456ae8
commit 55a3daa81d
18 changed files with 60 additions and 22 deletions
+6 -1
View File
@@ -189,7 +189,10 @@ GLOBAL_LIST_INIT(vore_words_snake, list("snake","serpent","reptilian","noodle","
/// `prey` may be a string or a specific prey ref.
/obj/belly/proc/belly_format_string(message, prey, use_absorbed_count = FALSE, item = null, dest = null, use_first_only = FALSE)
if(islist(message))
. = "[pick(message)]"
if(!LAZYLEN(message))
. = ""
else
. = "[pick(message)]"
else
. = "[message]"
@@ -236,6 +239,8 @@ GLOBAL_LIST_INIT(vore_words_snake, list("snake","serpent","reptilian","noodle","
. = replacetext(., "%snack", use_first_only ? GLOB.vore_words_snackname[1] : pick(GLOB.vore_words_snackname))
. = replacetext(., "%hot", use_first_only ? GLOB.vore_words_hot[1] : pick(GLOB.vore_words_hot))
. = replacetext(., "%snake", use_first_only ? GLOB.vore_words_snake[1] : pick(GLOB.vore_words_snake))
if(!.)
. = "No message set for this action. Please inform your pred to fix this."
// Get the line that should show up in Examine message if the owner of this belly
// is examined. By making this a proc, we not only take advantage of polymorphism,
+4 -1
View File
@@ -166,7 +166,10 @@
for(var/name in character.species.has_limbs)
var/obj/item/organ/external/O = character.organs_by_name[name]
if(!O)
prefs.organ_data[name] = "amputated"
if(name in GLOB.storable_amputated_organs)
prefs.organ_data[name] = "amputated"
else
prefs.rlimb_data.Remove(name) // Missing limb and not in the global list means default model
else if(O.robotic >= ORGAN_ROBOT)
prefs.organ_data[name] = "cyborg"
if(O.model)