Nabbers & Backend #8913

Mechoid · 2023-01-31T01:21:57Z

Adds Serpentids and Serpentid Monarchs as event species & subspecies, similar to old vox. "Whitelisted" as character setup for events (and maybe raiders?) is easier with the menu than the edit-character menu in game.

Backend: Icon generation for clothing is now updated to allow larger species that use offsets to determine where base 'human' clothing icons will go if allowed. Example: Nabbers use most human headgear pixelshifted up.

Species may have larger icons, and still be centered properly on the tile using offsets from the datum.

Species may have unique armor values inherent to them, applied to their limbs. If a limb is transplanted, it keeps its armor value!

Serpentids:
Large armored invertebrates.

Two sets of arms, swapped by the pull-punches verb. One set is for manipulation of objects, the other hunting and threat displays. Hunting arms

Their respiration requires multiple organs, and their blood contains acetone and phoron to manage it.

When suffering respiratory malfunction (gasping), their body will catalyze Dexalin in an attempt to mitigate it, costing nutrition.

Lore pending continued discussion.

MistakeNot4892 · 2023-01-31T01:51:55Z

code/game/objects/items.dm

+	var/icon/standing_icon
+	var/mob/living/carbon/human/H = wearer
+	if(ishuman(wearer) && H.species.get_offset_overlay_image(iconnodefault, icon2use, state2use, slot = slot_name))
+		standing_icon = H.species.get_offset_overlay_image(iconnodefault, icon2use, state2use, slot = slot_name)


Should cast this before the if so you aren't running the proc and associated cache lookup twice.

if(ishuman(wearer)) var/mob/living/carbon/human/H = wearer standing_icon = H.species.get_offset_overlay_image(iconnodefault, icon2use, state2use, slot = slot_name) || icon(icon = icon2use, icon_state = state2use) else standing_icon = icon(icon = icon2use, icon_state = state2use)

would also work.

One issue noted - standing_icon is an image if returned by get_offset_overlay_image() but an icon otherwise.

Your changes are still replicating a redundant typecheck on the human mob.

Mechoid · 2023-01-31T02:31:25Z

I.. also can't find the qdel in New()

MistakeNot4892 · 2023-01-31T02:32:59Z

code/modules/clothing/head/soft_caps.dm

@@ -7,6 +7,12 @@
 	siemens_coefficient = 0.9
 	body_parts_covered = 0

+	sprite_sheets = list(


You seem to be manually setting this in a lot of places, why is the base type's list not appropriate?

Icons exist for softcaps for Nabbers, but not really anything else. So using human sprites is preferred to defaulting to the grey softcap.

I would argue you should make the default a blank icon in that case, to be honest. This is a lot of redundant overrides.

What would the point of having the icon-shifting for headgear even be then, if nothing uses it?

The point of the offset system is so that in circumstances where no icon exists, it can offset the base icon. The default icon should not be used in cases where the offset will do the job.

That's what this is doing, it's telling the icon generation that there are proper sprites for the species. If it's set on the base head clothing, it uses the greycap for everything that isn't a softcap. It's the same reason (but intended this time) that all suit- or uniform-slot things become the harness.

I apparently never replied to this - the new system only uses an icon state from the sprite file if it exists, it won't apply a default like the old system, the 'default' will be an offset version of the human onmob icon.

MistakeNot4892 · 2023-01-31T02:34:51Z

code/modules/mob/living/carbon/human/human_defense.dm

@@ -177,6 +177,10 @@ emp_act
 		return 0
 	var/protection = 0
 	var/list/protective_gear = def_zone.get_covering_clothing()
+
+	if(def_zone.species.natural_armour_values)	// You have a Cool Alien Limb with armor? Congrats, you get that armor!


I should steal this for Nebula instead of doing it for the entire mob.

MistakeNot4892 · 2023-01-31T02:36:31Z

code/modules/organs/internal/heart.dm

@@ -44,10 +44,3 @@
 	robotic = ORGAN_ROBOT

 	standard_pulse_level = PULSE_NONE
-
-/obj/item/organ/internal/stomach/machine/handle_organ_proc_special()


Unrelated removal?

The stomach's proc is duplicated in the heart file for some reason. The proc still exists with the parent in stomach.dm

MistakeNot4892 · 2023-01-31T02:38:13Z

code/__defines/armour.dm

+// Armor will turn attacks into less dangerous (e.g. turning cut into bruise), so keep that in mind when decided what armor value to use.
+// Some levels are marked with what they intend to block in such way.
+
+#define  ARMOR_BALLISTIC_MINOR		10


You should either not port these, or port them thoroughly. Leaving every other value in the game as a bare number and using these defines just for one armour entry is pretty untidy.

These are also tab indented rather than space indented which is very grody in the diff. Nitpick.

I left the other values as I don't believe we have a universal value set we use for armor, and changing every piece of armor to fit the schema in a PR for an event species felt out-of-scope to me, since they probably don't fit neatly

In that case I would suggest making a separate PR with the armour defines to normalize them, or using bare numbers in the armour set on nabbers/suits.

Armor defines slain

MistakeNot4892 · 2023-01-31T02:38:48Z

code/__defines/damage_organs.dm

@@ -65,3 +65,10 @@
 #define MODULAR_BODYPART_INVALID    0 // Cannot be detached or reattached.
 #define MODULAR_BODYPART_PROSTHETIC 1 // Can be detached or reattached freely.
 #define MODULAR_BODYPART_CYBERNETIC 2 // Can be detached or reattached to compatible parent organs.
+
+//Blood levels. These are percentages based on the species blood_volume far.
+#define BLOOD_VOLUME_FULL    100


Similar to armour defines, you should use these in the blood volume code more broadly than just nabbers.

Species all have their own blood levels, removed 👍

Mechoid · 2023-07-10T01:09:30Z

why

Spookerton

You merged the main branch into your feature branch instead of rebasing your feature branch on the head commit of the main branch. You'll need to undo that.

Adds Nabbers as an event species, similar to old (current? they're not yet joinable to my knowledge) vox. "Whitelisted" as character setup for events (and maybe raiders?) is easier with the menu than the edit-character menu in game. Backend: Icon generation for humanmobs is now updated to allow larger species that use offsets to determine where base 'human' icons will go if allowed. Example: Nabbers use most human headgear pixelshifted up. Species may have larger icons, and still be centered properly on the tile.

…verride with tesh and vox in prep for icon system PR.

Monarch Amp crown sprite for base 'headgear'.

Fix Serpentids being able to use non-serpentid prosthetics. Serpentid voiceboxes are no longer auto-robotic, meaning they cannot speak GalCom without an implant, but can understand it. Serpentid voiceboxes no longer allow the serpentid to speak human languages by default. Enables the GalCom implant.

+Rebase.

Cannot utilize their wings when wearing something on their back. Cannot see well in bright light.

No longer wear headsets on their lower shoulder. Able to wear armor. Literally. They take the whole suit and just wear it like a tabard.

Mechoid added Feature The PR adds new functionality in some way. Lore This change affects the server's lore and setting. labels Jan 31, 2023

MistakeNot4892 reviewed Jan 31, 2023

View reviewed changes

Mechoid changed the title ~~Nabbers & Backend~~ [DNM] Pending Icon System; Nabbers & Backend Feb 1, 2023

Mechoid changed the title ~~[DNM] Pending Icon System; Nabbers & Backend~~ [Pending #8920] Nabbers & Backend Feb 10, 2023

Mechoid force-pushed the SerpentidExistence branch from 8e925b3 to 5f19a76 Compare March 4, 2023 20:50

Mechoid force-pushed the SerpentidExistence branch from e9eb210 to 30989c6 Compare July 8, 2023 21:56

Spookerton requested changes Aug 23, 2023

View reviewed changes

Spookerton added the Stale [PR] This requires additional work and appears abandoned. label Aug 23, 2023

Spookerton marked this pull request as draft August 23, 2023 15:16

Mechoid changed the title ~~[Pending #8920] Nabbers & Backend~~ Nabbers & Backend Sep 4, 2023

Mechoid force-pushed the SerpentidExistence branch 2 times, most recently from c327bde to d5d1d85 Compare September 4, 2023 12:23

Mechoid marked this pull request as ready for review September 4, 2023 12:24

Spookerton removed the Stale [PR] This requires additional work and appears abandoned. label Sep 10, 2023

Mechoid added 8 commits October 10, 2023 13:18

Nuke baylore, refinagle icon check.

3ad8f87

Blood defines unnecessary.

f6c5d73

Grabs self delete, this is unnecessary.

ad8dabb

Armor eliminated.

68198ff

Remove softcap override, add Nabber/Nabber Monarch to clothing/head o…

a56caf9

…verride with tesh and vox in prep for icon system PR.

Base space suit and helmet given refit DMIs.

a6bb0d7

Monarch Amp crown sprite for base 'headgear'.

Firebug, Wizard Suit.

56ac666

Mechoid added 12 commits October 10, 2023 13:18

LoafRebase

94093e8

Mechanical Serpentid parts. Icon fix for Nabber hands.

510a552

Monarch Serpentid has icons again

3854d74

My Eyes Are Up Here

d0add9c

Unable to hover while unconscious. Or Dead.

db4ae79

Serpentids cannot fly if you disable their torso.

7de5dc2

+Rebase.

Non-xenotech Rig.

9bac955

Serpentids

991491c

Cannot utilize their wings when wearing something on their back. Cannot see well in bright light.

Serpentids can wear masks.

39c77ec

Unversioned File.wav

948ae37

Serpentids

ebc98a7

No longer wear headsets on their lower shoulder. Able to wear armor. Literally. They take the whole suit and just wear it like a tabard.

Mechoid force-pushed the SerpentidExistence branch from 8cfab42 to ebc98a7 Compare October 10, 2023 20:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Nabbers & Backend #8913

Nabbers & Backend #8913

Mechoid commented Jan 31, 2023 •

edited

Loading

MistakeNot4892 Jan 31, 2023

MistakeNot4892 Jan 31, 2023

MistakeNot4892 Jan 31, 2023

Mechoid commented Jan 31, 2023

MistakeNot4892 Jan 31, 2023

Mechoid Jan 31, 2023

MistakeNot4892 Jan 31, 2023

Mechoid Feb 1, 2023

MistakeNot4892 Feb 1, 2023

Mechoid Feb 1, 2023

MistakeNot4892 Jul 7, 2023

MistakeNot4892 Jan 31, 2023 •

edited

Loading

MistakeNot4892 Jan 31, 2023

Mechoid Jan 31, 2023

MistakeNot4892 Jan 31, 2023

MistakeNot4892 Jan 31, 2023

Mechoid Feb 1, 2023 •

edited

Loading

MistakeNot4892 Feb 1, 2023

Mechoid Feb 1, 2023

MistakeNot4892 Jan 31, 2023

Mechoid Feb 1, 2023

Mechoid commented Jul 10, 2023

Spookerton left a comment

Nabbers & Backend #8913

Are you sure you want to change the base?

Nabbers & Backend #8913

Conversation

Mechoid commented Jan 31, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mechoid commented Jan 31, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MistakeNot4892 Jan 31, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mechoid Feb 1, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mechoid commented Jul 10, 2023

Spookerton left a comment

Choose a reason for hiding this comment

Mechoid commented Jan 31, 2023 •

edited

Loading

MistakeNot4892 Jan 31, 2023 •

edited

Loading

Mechoid Feb 1, 2023 •

edited

Loading