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-26 08:39:44 +02:00
committed by GitHub
parent 2a47456ae8
commit 55a3daa81d
18 changed files with 60 additions and 22 deletions
@@ -197,7 +197,7 @@
if(vantag_hud)
compiled_vis |= VIS_CH_VANTAG
if(client?.prefs.read_preference(/datum/preference/toggle/tummy_sprites))
if(client?.prefs?.read_preference(/datum/preference/toggle/tummy_sprites))
compiled_vis += VIS_CH_STOMACH
if(soulgem?.flag_check(SOULGEM_SEE_SR_SOULS))
@@ -153,7 +153,7 @@
H.nif.unimplant(H) //Needs reference to owner to unimplant right.
H.nif.moveToNullspace()
..()
if(saved_nif)
if(saved_nif && !ismannequin(H))
saved_nif.quick_implant(H)
/datum/species/protean/get_race_key()
@@ -66,6 +66,7 @@
//Melee Check
if(istype(thing_to_check, /obj/item/melee/robotic))
var/obj/item/melee/robotic/melee = thing_to_check
melee.refresh_light(TRUE)
if(sprite_flag_check(ROBOT_HAS_MELEE_SPRITE) && melee.weapon_flag_check(COUNTS_AS_ROBOTIC_MELEE))
ourborg.add_overlay("[sprite_icon_state]-melee")
continue
@@ -113,6 +113,7 @@
sprite_hud_icon_state = "ert"
rest_sprite_options = list("Default", "Sit")
sprite_flags = ROBOT_HAS_GUN_SPRITE | ROBOT_HAS_SHIELD_SPRITE
/datum/robot_sprite/dogborg/tall/combat/derg/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
..()
if(ourborg.resting)
@@ -48,7 +48,7 @@
B.name = "trap"
B.desc = "As you step onto the large leaves of the mantrap, they suddenly shoot up and snap shut around you, encasing you in a fleshy-feeling gut. The saw-toothed spikes around the edge of the leaves interlock with one another and exerts a tremendous pressure on your body. Copious volumes of fluids begin to seep in from the walls themselves, rapidly coating your body and pooling around you, all of your movements only seem to speed up this process.."
B.mode_flags = DM_FLAG_THICKBELLY
B.belly_fullscreen = "destination_tumby"
B.belly_fullscreen = "VBO_maw12"
B.belly_fullscreen_color = "#02a802"
B.digest_brute = 2
B.digest_burn = 2
@@ -141,7 +141,7 @@
B.name = "stomach"
B.desc = "Walking a little too close to the pitcher plant, you trigger its trap mechanism and a tendril shoots out towards you. Wrapping around your body, you are rapidly dragged into the open mouth of the plant, stuffing your entire body into a fleshy, green stomach filled with a pool of some sort of tingling liquid. The lid of the plant slams down over the mouth, making it far more difficult to escape, all whilst that pool steadily seems to be filling up."
B.mode_flags = DM_FLAG_THICKBELLY
B.belly_fullscreen = "destination_tumby"
B.belly_fullscreen = "VBO_belly1"
B.belly_fullscreen_color = "#02a802"
B.digest_brute = 1
B.digest_burn = 1
@@ -103,7 +103,7 @@ List of things solar grubs should be able to do:
PN = null
/*if(prob(1) && charge >= 32000 && can_evolve == 1 && moth_amount < 1) //it's reading from the moth_amount global list to determine if it can evolve. There should only ever be a maxcap of 1 existing solar moth alive at any time. TODO: make the code decrease the list after 1 has spawned this shift.
anchored = 0
PN = attached.powernet
PN = null
release_vore_contents()
if(prey_excludes)
prey_excludes.Cut()