cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into IPC-buffs

Browse Source
This commit is contained in:
SteelSlayer
2020-09-10 17:20:35 -05:00
parent 9173469c67 c04243abc7
commit f0fd61bb0d
674 changed files with 49570 additions and 291677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_eyes.dm
+1 -1
View File
@@ -62,7 +62,7 @@
name = "X-ray implant"
desc = "These cybernetic eye implants will give you X-ray vision. Blinking is futile."
implant_color = "#000000"
origin_tech = "materials=4;programming=4;biotech=6;magnets=4"
origin_tech = "materials=4;programming=4;biotech=7;magnets=4"
vision_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
code/modules/surgery/organs/helpers.dm
+1 -1
View File
@@ -104,7 +104,7 @@
/mob/living/carbon/human/get_leg_ignore()
if(flying == 1)
if(flying || floating)
return TRUE
var/obj/item/tank/jetpack/J
code/modules/surgery/organs/organ_icon.dm
+4 -1
View File
@@ -107,7 +107,10 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
add_overlay(eyes_icon)
if(owner.lip_style && (LIPS in dna.species.species_traits))
add_overlay(mutable_appearance('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s")) //Hefty icon not necessary.
var/icon/lips_icon = new('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s")
lips_icon.Blend(owner.lip_color, ICON_MULTIPLY)
mob_icon.Blend(lips_icon, ICON_OVERLAY)
add_overlay(lips_icon)
var/head_marking = owner.m_styles["head"]
if(head_marking)
code/modules/surgery/organs/robolimbs.dm
-12
View File
@@ -3,18 +3,6 @@ GLOBAL_LIST_EMPTY(chargen_robolimbs)
GLOBAL_LIST_EMPTY(selectable_robolimbs)
GLOBAL_DATUM(basic_robolimb, /datum/robolimb)
/proc/populate_robolimb_list()
GLOB.basic_robolimb = new()
for(var/limb_type in typesof(/datum/robolimb))
var/datum/robolimb/R = new limb_type()
GLOB.all_robolimbs[R.company] = R
if(!R.unavailable_at_chargen)
if(R != "head" && R != "chest" && R != "groin" ) //Part of the method that ensures only IPCs can access head, chest and groin prosthetics.
if(R.has_subtypes) //Ensures solos get added to the list as well be incorporating has_subtypes == 1 and has_subtypes == 2.
GLOB.chargen_robolimbs[R.company] = R //List only main brands and solo parts.
if(R.selectable)
GLOB.selectable_robolimbs[R.company] = R
/datum/robolimb
var/company = "Unbranded" // Shown when selecting the limb.
var/desc = "A generic unbranded robotic prosthesis." // Seen when examining a limb.