Merge branch 'virgoMaster' into virgoPull

This commit is contained in:
Reddeyfish
2018-04-28 10:12:34 -07:00
334 changed files with 171194 additions and 125302 deletions
+2
View File
@@ -1206,6 +1206,8 @@ Note that amputating the affected organ does in fact remove the infection from t
victim.organs -= src
victim.organs_by_name[organ_tag] = null // Remove from owner's vars.
status |= ORGAN_CUT_AWAY //Checked during surgeries to reattach it
//Robotic limbs explode if sabotaged.
if(is_robotic && sabotaged)
victim.visible_message(
+1 -1
View File
@@ -42,7 +42,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
var/lifelike // If set, appears organic.
var/skin_tone // If set, applies skin tone rather than part color
var/blood_color = "#030303"
var/list/species_cannot_use = list(SPECIES_TESHARI, "Promethean") //VOREStation Add
var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN) //VOREStation Edit
var/list/monitor_styles //If empty, the model of limbs offers a head compatible with monitors.
var/parts = BP_ALL //Defines what parts said brand can replace on a body.
var/health_hud_intensity = 1 // Intensity modifier for the health GUI indicator.
+15
View File
@@ -168,3 +168,18 @@
/obj/item/weapon/disk/limb/dsi_spider
company = "DSI - Vasilissan"
/datum/robolimb/dsi_teshari
company = "DSI - Teshari"
desc = "This limb has a thin synthflesh casing with a few connection ports."
icon = 'icons/mob/human_races/cyberlimbs/DSITeshari/dsi_teshari.dmi'
lifelike = 1
suggested_species = "Teshari"
/datum/robolimb/dsi_teshari/New()
species_cannot_use = all_species.Copy()
species_cannot_use -= SPECIES_TESHARI
..()
/obj/item/weapon/disk/limb/dsi_teshari
company = "DSI - Teshari"