cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7926

Browse Source
This commit is contained in:
Unknown
2021-02-28 18:08:41 -05:00
parent 92512f4aa7 827b30c844
commit 5c28be8c30
8 changed files with 66 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_powers.dm
+1 -1
View File
@@ -366,7 +366,7 @@
return
var/datum/robolimb/robohead = all_robolimbs[E.model]
if(!robohead.monitor_styles || !robohead.monitor_icon)
to_chat(src,"<span class='warning'>Your head doesn't have a monitor or it doens't support to be changed!</span>")
to_chat(src,"<span class='warning'>Your head doesn't have a monitor, or it doesn't support being changed!</span>")
return
var/list/states
if(!states)
code/modules/mob/living/carbon/human/species/outsider/event.dm
+1 -1
View File
@@ -122,7 +122,7 @@ Variables you may want to make use of are:
has_limbs = list(
BP_TORSO = list("path" = /obj/item/organ/external/chest),
BP_GROIN = list("path" = /obj/item/organ/external/groin),
BP_HEAD = list("path" = /obj/item/organ/external/head),
BP_HEAD = list("path" = /obj/item/organ/external/head),
BP_L_ARM = list("path" = /obj/item/organ/external/arm),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right),
BP_L_LEG = list("path" = /obj/item/organ/external/leg),
code/modules/mob/living/carbon/human/species/species.dm
+3
View File
@@ -349,6 +349,9 @@
var/limb_path = organ_data["path"]
var/obj/item/organ/O = new limb_path(H)
organ_data["descriptor"] = O.name
if(O.parent_organ)
organ_data = has_limbs[O.parent_organ]
organ_data["has_children"] = organ_data["has_children"]+1
for(var/organ_tag in has_organ)
var/organ_type = has_organ[organ_tag]