Merge pull request #9897 from VOREStation/upstream-merge-7963

[MIRROR] Tweaked implant loadout, refactored implant detection.
This commit is contained in:
Novacat
2021-03-10 14:40:05 -05:00
committed by GitHub
7 changed files with 33 additions and 23 deletions
@@ -512,6 +512,9 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
/datum/gear_tweak/implant_location
var/static/list/bodypart_names_to_tokens = list(
"head" = BP_HEAD,
"upper body" = BP_TORSO,
"lower body" = BP_GROIN,
"left hand" = BP_L_HAND,
"left arm" = BP_L_ARM,
"right hand" = BP_R_HAND,
@@ -519,12 +522,12 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
"left foot" = BP_L_FOOT,
"left leg" = BP_L_LEG,
"right foot" = BP_R_FOOT,
"right leg" = BP_R_LEG,
"lower body" = BP_GROIN,
"upper body" = BP_TORSO,
"head" = BP_HEAD
"right leg" = BP_R_LEG
)
var/static/list/bodypart_tokens_to_names = list(
BP_HEAD = "head",
BP_TORSO = "upper body",
BP_GROIN = "lower body",
BP_LEFT_HAND = "left hand",
BP_LEFT_ARM = "left arm",
BP_RIGHT_HAND = "right hand",
@@ -532,14 +535,11 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
BP_LEFT_FOOT = "left foot",
BP_LEFT_LEG = "left leg",
BP_RIGHT_FOOT = "right foot",
BP_RIGHT_LEG = "right leg",
BP_GROIN = "lower body",
BP_TORSO = "upper body",
BP_HEAD = "head"
BP_RIGHT_LEG = "right leg"
)
/datum/gear_tweak/implant_location/get_default()
return BP_TORSO
return bodypart_names_to_tokens[1]
/datum/gear_tweak/implant_location/tweak_item(var/obj/item/weapon/implant/I, var/metadata)
if(istype(I))
+1
View File
@@ -23,6 +23,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
icon_state = "nif_0"
w_class = ITEMSIZE_TINY
var/known_implant = TRUE
var/durability = 100 // Durability remaining
var/bioadap = FALSE // If it'll work in fancy species
+1
View File
@@ -11,6 +11,7 @@
/datum/category_item/catalogue/technology/resleeving)
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "backup_implant"
known_implant = TRUE
/obj/item/weapon/implant/backup/get_data()
var/dat = {"