cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-12-21 21:57:49 +00:00
parent 06a47d15d5 8b9806c8c4
commit 6b935d64ec
192 changed files with 7436 additions and 5475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/organs/blood.dm
View File

@@ -303,8 +303,8 @@ proc/blood_incompatible(donor,receiver,donor_species,receiver_species)
if(donor_species != receiver_species)
return 1
var/donor_antigen = copytext(donor,1,lentext(donor))
var/receiver_antigen = copytext(receiver,1,lentext(receiver))
var/donor_antigen = copytext(donor,1,length(donor))
var/receiver_antigen = copytext(receiver,1,length(receiver))
var/donor_rh = (findtext(donor,"+")>0)
var/receiver_rh = (findtext(receiver,"+")>0)

2
code/modules/organs/internal/voicebox.dm
View File

@@ -18,7 +18,7 @@
/obj/item/organ/internal/voicebox/proc/amend_assist_langs() // Adds the list of language datums assisted by the voicebox to the list used in speaking
for(var/L in will_assist_languages)
assists_languages |= all_languages[L]
assists_languages |= GLOB.all_languages[L]
/obj/item/organ/internal/voicebox/proc/add_assistable_langs(var/language) // Adds a new language (by string/define) to the list of things the voicebox can assist
will_assist_languages |= language

4
code/modules/organs/organ.dm
View File

@@ -65,7 +65,7 @@ var/list/organ_cache = list()
if(istype(holder))
src.owner = holder
src.w_class = max(src.w_class + mob_size_difference(holder.mob_size, MOB_MEDIUM), 1) //smaller mobs have smaller organs.
species = all_species[SPECIES_HUMAN]
species = GLOB.all_species[SPECIES_HUMAN]
if(holder.dna)
dna = holder.dna.Clone()
species = holder.species //VOREStation Edit - For custom species
@@ -87,7 +87,7 @@ var/list/organ_cache = list()
if(internal)
holder.internal_organs |= src
else
species = all_species["Human"]
species = GLOB.all_species["Human"]
handle_organ_mod_special()

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

@@ -1032,7 +1032,7 @@ Note that amputating the affected organ does in fact remove the infection from t
W.germ_level = 0
return rval
/obj/item/organ/external/proc/clamp()
/obj/item/organ/external/proc/organ_clamp()
var/rval = 0
src.status &= ~ORGAN_BLEEDING
for(var/datum/wound/W in wounds)

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

@@ -71,7 +71,8 @@ var/global/list/limb_icon_cache = list()
if(should_have_eyes)
//And we have them
if(eyes)
eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD)
if(has_eye_color)
eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD)
//They're gone!
else
eyes_icon.Blend(rgb(128,0,0), ICON_ADD)

2
code/modules/organs/robolimbs_vr.dm
View File

@@ -202,7 +202,7 @@
suggested_species = "Teshari"
/datum/robolimb/dsi_teshari/New()
species_cannot_use = all_species.Copy()
species_cannot_use = GLOB.all_species.Copy()
species_cannot_use -= SPECIES_TESHARI
..()

3
code/modules/organs/subtypes/standard_vr.dm
View File

@@ -20,7 +20,8 @@
if(eye_icon)
var/icon/eyes_icon = new/icon(eye_icons_vr, eye_icon_vr)
if(eyes)
eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD)
if(owner.species.appearance_flags & HAS_EYE_COLOR)
eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD)
else
eyes_icon.Blend(rgb(128,0,0), ICON_ADD)
mob_icon.Blend(eyes_icon, ICON_OVERLAY)