cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 23:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aut'akh unathi fixes: limbs and loadout (#6091)

Browse Source
This commit is contained in:
Alberyk
2019-02-24 08:17:19 -03:00
committed by Werner
parent fe391bc153
commit edd11d37c3
5 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/client/preference_setup/loadout/loadout_xeno.dm
View File

@@ -53,7 +53,7 @@
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/autakh_engineering
display_name = "engineering grasper (Aut'akh Unathi)"
display_name = "engineering grasper"
description = "An Aut'akh augment limb, this one is outfitted with a limited toolkit."
path = /obj/item/organ/external/hand/right/autakh/tool
whitelisted = list("Aut'akh Unathi")
@@ -61,8 +61,8 @@
cost = 3
allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician", "Engineering Apprentice", "Roboticist")
/datum/gear/autakh_engineering
display_name = "mining grasper (Aut'akh Unathi)"
/datum/gear/autakh_mining
display_name = "mining grasper"
description = "An Aut'akh augment limb, this one is outfitted with a mining drill."
path = /obj/item/organ/external/hand/right/autakh/tool/mining
whitelisted = list("Aut'akh Unathi")
@@ -71,7 +71,7 @@
allowed_roles = list("Shaft Miner")
/datum/gear/autakh_medical
display_name = "medical grasper (Aut'akh Unathi)"
display_name = "medical grasper"
description = "An Aut'akh augment limb, this one is outfitted with a health scanner."
path = /obj/item/organ/external/hand/right/autakh/medical
whitelisted = list("Aut'akh Unathi")
@@ -80,7 +80,7 @@
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")
/datum/gear/autakh_security
display_name = "security grasper (Aut'akh Unathi)"
display_name = "security grasper"
description = "An Aut'akh augment limb, this one is outfitted with an electroshock weapon."
path = /obj/item/organ/external/hand/right/autakh/security
whitelisted = list("Aut'akh Unathi")
@@ -381,24 +381,24 @@
display_name = "cloth footwraps"
path = /obj/item/clothing/shoes/footwraps
sort_category = "Xenowear"
whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
/datum/gear/shoes/toeless
display_name = "toe-less jackboots"
path = /obj/item/clothing/shoes/jackboots/unathi
sort_category = "Xenowear"
whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
/datum/gear/shoes/workboots_toeless
display_name = "toeless workboots"
path = /obj/item/clothing/shoes/workboots/toeless
sort_category = "Xenowear"
whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
/datum/gear/shoes/caligae
display_name = "caligae"
path = /obj/item/clothing/shoes/caligae
whitelisted = list("Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara", "Aut'akh Unathi")
whitelisted = list("Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear"
/datum/gear/shoes/caligae/New()

9
code/modules/mob/living/carbon/human/human_powers.dm
View File

@@ -961,11 +961,12 @@
to_chat(src,"<span class='warning'>Your body fails to interface with this alien technology.</span>")
return
if(organs_by_name[O.limb_name])
to_chat(src,"<span class='warning'>You already have a limb of this type.</span>")
return
var/obj/item/organ/external/E = get_organ(zone_sel.selecting)
if(E)
to_chat(src,"<span class='warning'>You are not missing that limb.</span>")
if(!organs_by_name[O.parent_organ])
to_chat(src,"<span class='warning'>You are unable to find a place to attach \the [O] to your body.</span>")
return
last_special = world.time + 20

3
code/modules/organs/organ_external.dm
View File

@@ -212,6 +212,9 @@
break
parent.update_damages()
action_button_name = initial(action_button_name)
owner.update_action_buttons()
/****************************************************
DAMAGE PROCS
****************************************************/

4
code/modules/organs/subtypes/autakh.dm
View File

@@ -162,7 +162,7 @@
/obj/item/organ/eyes/autakh/flash_act()
if(owner)
to_chat(owner, "<span class='notice'>\The [src]'s retinal overlays are overloaded by the strong light!</span>")
to_chat(owner, "<span class='notice'>Your [singular_name]'s retinal overlays are overloaded by the strong light!</span>")
owner.eye_blind = 5
owner.eye_blurry = 5
spark(get_turf(owner), 3)
@@ -183,7 +183,7 @@
disabled = FALSE
if(owner)
to_chat(owner, "<span class='notice'>\The [src]'s retinal overlays clicks and shifts!</span>")
to_chat(owner, "<span class='notice'>\The [singular_name]'s retinal overlays clicks and shifts!</span>")
/obj/item/organ/adrenal
name = "adrenal management system"

7
html/changelogs/alberyk-autakhfix.yml Normal file
View File

@@ -0,0 +1,7 @@
author: Alberyk
delete-after: True
changes:
- bugfix: "Aut'akh graspers can now be selected in the loadout."
- bugfix: "Aut'akh limbs should behave in a more sane way when removed or replaced."