Converts Eye Augments to Cybernetic Eyes (#15519)

* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
This commit is contained in:
Fox McCloud
2021-03-03 20:21:30 +00:00
committed by GitHub
parent dcace52184
commit 75935ff876
47 changed files with 339 additions and 382 deletions
+1 -1
View File
@@ -406,7 +406,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = H.dna.species ? H.dna.species.eyes : "eyes_s")
if(!eyes_organ)
return
eyes_s.Blend(eyes_organ.eye_colour, ICON_ADD)
eyes_s.Blend(eyes_organ.eye_color, ICON_ADD)
face_s.Blend(eyes_s, ICON_OVERLAY)
var/datum/sprite_accessory/hair_style = GLOB.hair_styles_full_list[head_organ.h_style]
+1 -2
View File
@@ -239,9 +239,8 @@
/obj/item/implant/dust
)
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/eyes/shield,
/obj/item/organ/internal/cyberimp/eyes/hud/security,
/obj/item/organ/internal/cyberimp/eyes/xray,
/obj/item/organ/internal/eyes/cybernetic/xray,
/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
/obj/item/organ/internal/cyberimp/arm/combat/centcom
+10 -22
View File
@@ -1556,43 +1556,32 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
surplus = 0
gamemodes = list(/datum/game_mode/nuclear)
/datum/uplink_item/cyber_implants/spawn_item(turf/loc, obj/item/uplink/U)
if(item)
if(findtext(item, /obj/item/organ/internal/cyberimp))
U.uses -= max(cost, 0)
U.used_TC += cost
SSblackbox.record_feedback("nested tally", "traitor_uplink_items_bought", 1, list("[initial(name)]", "[cost]")) //this one and the line before copypasted because snowflaek code
return new /obj/item/storage/box/cyber_implants(loc, item)
else
return ..()
/datum/uplink_item/cyber_implants/thermals
name = "Thermal Vision Implant"
desc = "These cybernetic eyes will give you thermal vision. Comes with an automated implanting tool."
desc = "These cybernetic eyes will give you thermal vision. Comes with an autosurgeon."
reference = "CIT"
item = /obj/item/organ/internal/cyberimp/eyes/thermals
item = /obj/item/autosurgeon/organ/syndicate/thermal_eyes
cost = 8
/datum/uplink_item/cyber_implants/xray
name = "X-Ray Vision Implant"
desc = "These cybernetic eyes will give you X-ray vision. Comes with an automated implanting tool."
desc = "These cybernetic eyes will give you X-ray vision. Comes with an autosurgeon."
reference = "CIX"
item = /obj/item/organ/internal/cyberimp/eyes/xray
item = /obj/item/autosurgeon/organ/syndicate/xray_eyes
cost = 10
/datum/uplink_item/cyber_implants/antistun
name = "Hardened CNS Rebooter Implant"
desc = "This implant will help you get back up on your feet faster after being stunned. It is invulnerable to EMPs. \
Comes with an automated implanting tool."
desc = "This implant will help you get back up on your feet faster after being stunned. It is immune to EMP attacks. Comes with an autosurgeon."
reference = "CIAS"
item = /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened
item = /obj/item/autosurgeon/organ/syndicate/anti_stun
cost = 12
/datum/uplink_item/cyber_implants/reviver
name = "Hardened Reviver Implant"
desc = "This implant will attempt to revive you if you lose consciousness. It is invulnerable to EMPs. Comes with an automated implanting tool."
desc = "This implant will attempt to revive and heal you if you lose consciousness. It is immune to EMP attacks. Comes with an autosurgeon."
reference = "CIR"
item = /obj/item/organ/internal/cyberimp/chest/reviver/hardened
item = /obj/item/autosurgeon/organ/syndicate/reviver
cost = 8
// POINTLESS BADASSERY
@@ -1674,10 +1663,9 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/bundles_TC/cyber_implants
name = "Cybernetic Implants Bundle"
desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. \
Comes with an automated implanting tool."
desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon."
reference = "CIB"
item = /obj/item/storage/box/cyber_implants/bundle
item = /obj/item/storage/box/cyber_implants
cost = 40
gamemodes = list(/datum/game_mode/nuclear)
-8
View File
@@ -4,15 +4,7 @@
var/sight_flags = 0
var/see_in_dark = 0
var/lighting_alpha
var/light_sensitive = 0
/datum/vision_override/nightvision
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
/datum/vision_override/nightvision/thermals
sight_flags = SEE_MOBS
/datum/vision_override/nightvision/thermals/ling_augmented_eyesight
light_sensitive = 1