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 branch 'master' into upstream-merge-9828

Browse Source
This commit is contained in:
Nadyr
2021-03-06 05:11:00 -05:00
committed by GitHub
parent acfa131d5b 6889855c97
commit 7fcacaeef1
98 changed files with 1558 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/organs/internal/augment.dm
View File

@@ -64,6 +64,10 @@
else
return
if(robotic && owner.get_restraining_bolt())
to_chat(owner, "<span class='warning'>\The [src] doesn't respond.</span>")
return
var/item_to_equip = integrated_object
if(!item_to_equip && integrated_object_type)
item_to_equip = integrated_object_type

2
code/modules/organs/internal/augment/armmounted.dm
View File

@@ -143,7 +143,7 @@
if(istype(owner, /mob/living/carbon/human))
var/mob/living/carbon/human/H = owner
H.add_modifier(/datum/modifier/melee_surge, 0.75 MINUTES)
/obj/item/organ/internal/augment/armmounted/shoulder/blade
name = "armblade implant"
desc = "A large implant that fits into a subject's arm. It deploys a large metal blade by some painful means."

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

@@ -236,6 +236,7 @@
owner.organs |= src
for(var/obj/item/organ/organ in src)
organ.replaced(owner,src)
owner.refresh_modular_limb_verbs()
if(parent_organ)
parent = owner.organs_by_name[src.parent_organ]
@@ -1132,6 +1133,8 @@ Note that amputating the affected organ does in fact remove the infection from t
if(R.lifelike)
robotic = ORGAN_LIFELIKE
name = "[initial(name)]"
else if(R.modular_bodyparts == MODULAR_BODYPART_PROSTHETIC)
name = "prosthetic [initial(name)]"
else
name = "robotic [initial(name)]"
desc = "[R.desc] It looks like it was produced by [R.company]."
@@ -1163,7 +1166,7 @@ Note that amputating the affected organ does in fact remove the infection from t
while(null in owner.internal_organs)
owner.internal_organs -= null
owner.refresh_modular_limb_verbs()
return 1
/obj/item/organ/external/proc/mutate()
@@ -1264,6 +1267,7 @@ Note that amputating the affected organ does in fact remove the infection from t
qdel(spark_system)
qdel(src)
victim.refresh_modular_limb_verbs()
victim.update_icons_body()
/obj/item/organ/external/proc/disfigure(var/type = "brute")

163
code/modules/organs/robolimbs.dm
View File

@@ -47,30 +47,6 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
var/icon = 'icons/mob/human_races/robotic.dmi' // Icon base to draw from.
var/monitor_icon = 'icons/mob/monitor_icons.dmi' // Where it draws the monitor icon from.
var/unavailable_at_chargen // If set, not available at chargen.
<<<<<<< HEAD
var/unavailable_to_build // If set, can't be constructed.
var/lifelike // If set, appears organic.
var/skin_tone // If set, applies skin tone rather than part color Overrides color.
var/skin_color // If set, applies skin color rather than part color.
var/blood_color = "#030303"
var/blood_name = "oil"
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
var/unavailable_to_build // If set, can't be constructed.
var/lifelike // If set, appears organic.
var/skin_tone // If set, applies skin tone rather than part color Overrides color.
var/skin_color // If set, applies skin color rather than part color.
var/blood_color = SYNTH_BLOOD_COLOUR // Colour for blood splatters.
var/blood_name = "oil" // Descriptor for blood splatters.
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.
var/suggested_species = "Human" // If it should make the torso a species
var/speech_bubble_appearance = "synthetic" // What icon_state to use for speech bubbles when talking. Check talk.dmi for all the icons.
var/modular_bodyparts = MODULAR_BODYPART_INVALID // Whether or not this limb allows attaching/detaching, and whether or not it checks its parent as well.
var/robo_brute_mod = 1 // Multiplier for incoming brute damage.
var/robo_burn_mod = 1 // As above for burn.
// Species in this list cannot take these prosthetics.
=======
var/unavailable_to_build // If set, can't be constructed.
var/lifelike // If set, appears organic.
var/skin_tone // If set, applies skin tone rather than part color Overrides color.
@@ -86,17 +62,9 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
var/robo_brute_mod = 1 // Multiplier for incoming brute damage.
var/robo_burn_mod = 1 // As above for burn.
// Species in this list cannot take these prosthetics.
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_XENOCHIMERA) //VOREStation Edit
var/list/species_alternates = list(SPECIES_TAJ = "Unbranded - Tajaran", SPECIES_UNATHI = "Unbranded - Unathi") //"Species Name" = "Robolimb Company" , List, when initialized, will become "Species Name" = RobolimbDatum, used for alternate species sprites.
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.
var/suggested_species = "Human" //If it should make the torso a species
var/speech_bubble_appearance = "synthetic" // What icon_state to use for speech bubbles when talking. Check talk.dmi for all the icons.
var/robo_brute_mod = 1 // Multiplier for incoming brute damage.
var/robo_burn_mod = 1 // As above for burn.
// "Species Name" = "Robolimb Company", List, when initialized, will become "Species Name" = RobolimbDatum, used for alternate species sprites.
var/list/species_alternates = list(SPECIES_TAJ = "Unbranded - Tajaran", SPECIES_UNATHI = "Unbranded - Unathi")
/datum/robolimb/unbranded_monitor
company = "Unbranded Monitor"
@@ -110,29 +78,15 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
company = "Unbranded - Protez"
desc = "A simple robotic limb with retro design. Seems rather stiff."
icon = 'icons/mob/human_races/cyberlimbs/unbranded/unbranded_alt1.dmi'
<<<<<<< HEAD
unavailable_to_build = 0 // CHOMP Edit
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/unbranded_alt2
company = "Unbranded - Mantis Prosis"
desc = "This limb has a casing of sleek black metal and repulsive insectile design."
icon = 'icons/mob/human_races/cyberlimbs/unbranded/unbranded_alt2.dmi'
<<<<<<< HEAD
unavailable_to_build = 0 // CHOMP Edit
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/unbranded_tajaran
company = "Unbranded - Tajaran"
@@ -141,12 +95,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
desc = "A simple robotic limb with feline design. Seems rather stiff."
icon = 'icons/mob/human_races/cyberlimbs/unbranded/unbranded_tajaran.dmi'
unavailable_to_build = 1
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/unbranded_unathi
company = "Unbranded - Unathi"
@@ -155,12 +104,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
desc = "A simple robotic limb with reptilian design. Seems rather stiff."
icon = 'icons/mob/human_races/cyberlimbs/unbranded/unbranded_unathi.dmi'
unavailable_to_build = 1
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/unbranded_teshari
company = "Unbranded - Teshari"
@@ -169,16 +113,6 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
desc = "A simple robotic limb with a small, raptor-like design. Seems rather stiff."
icon = 'icons/mob/human_races/cyberlimbs/unbranded/unbranded_teshari.dmi'
unavailable_to_build = 0
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
parts = list(BP_HEAD, BP_TORSO, BP_GROIN)
/datum/robolimb/unbranded_teshari/limbs
company = "Unbranded - Teshari (Limbs)"
parts = list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
parts = list(BP_HEAD, BP_TORSO, BP_GROIN)
@@ -186,19 +120,13 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
company = "Unbranded - Teshari (Limbs)"
parts = list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/nanotrasen
company = "NanoTrasen"
desc = "A simple but efficient robotic limb, created by NanoTrasen."
icon = 'icons/mob/human_races/cyberlimbs/nanotrasen/nanotrasen_main.dmi'
species_alternates = list(SPECIES_TAJ = "NanoTrasen - Tajaran", SPECIES_UNATHI = "NanoTrasen - Unathi")
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/nanotrasen_tajaran
company = "NanoTrasen - Tajaran"
@@ -208,12 +136,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
desc = "A simple but efficient robotic limb, created by NanoTrasen."
icon = 'icons/mob/human_races/cyberlimbs/nanotrasen/nanotrasen_tajaran.dmi'
unavailable_to_build = 1
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/nanotrasen_unathi
company = "NanoTrasen - Unathi"
@@ -223,12 +146,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
desc = "A simple but efficient robotic limb, created by NanoTrasen."
icon = 'icons/mob/human_races/cyberlimbs/nanotrasen/nanotrasen_unathi.dmi'
unavailable_to_build = 1
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/cenilimicybernetics_teshari
company = "Cenilimi Cybernetics"
@@ -238,12 +156,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
desc = "Made by a Teshari-owned company, for Teshari."
icon = 'icons/mob/human_races/cyberlimbs/cenilimicybernetics/cenilimicybernetics_teshari.dmi'
unavailable_to_build = 1
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/bishop
company = "Bishop"
@@ -295,39 +208,22 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
company = "Cyber Solutions"
desc = "This limb is grey and rough, with little in the way of aesthetic."
icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_main.dmi'
<<<<<<< HEAD
unavailable_to_build = 0 // CHOMP Edit
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/cybersolutions_alt2
company = "Cyber Solutions - Outdated"
desc = "This limb is of severely outdated design; there's no way it's comfortable or very functional to use."
icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt2.dmi'
unavailable_to_build = 1
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/cybersolutions_alt1
company = "Cyber Solutions - Wight"
desc = "This limb has cheap plastic panels mounted on grey metal."
icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt1.dmi'
unavailable_to_build = 1
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/cybersolutions_alt3
company = "Cyber Solutions - Array"
@@ -341,15 +237,8 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
company = "Einstein Engines"
desc = "This limb is lightweight with a sleek design."
icon = 'icons/mob/human_races/cyberlimbs/einstein/einstein_main.dmi'
<<<<<<< HEAD
unavailable_to_build = 0 // CHOMP Edit
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/grayson
company = "Grayson"
@@ -361,12 +250,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
green=grayson_green;\
blue=grayson_blue;\
rgb=grayson_rgb"
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/grayson_alt1
company = "Grayson - Reinforced"
@@ -394,14 +278,8 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
company = "Hephaestus"
desc = "This limb has a militaristic black and green casing with gold stripes."
icon = 'icons/mob/human_races/cyberlimbs/hephaestus/hephaestus_main.dmi'
<<<<<<< HEAD
unavailable_to_build = 0 // CHOMP Edit
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
unavailable_to_build = 1
=======
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/hephaestus_alt1
company = "Hephaestus - Frontier"
@@ -442,12 +320,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
icon = 'icons/mob/human_races/cyberlimbs/morpheus/morpheus_main.dmi'
unavailable_to_build = 0 // CHOMP Edit
monitor_styles = standard_monitor_styles
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/morpheus_alt1
company = "Morpheus - Zenith"
@@ -499,15 +372,8 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
company = "Ward-Takahashi"
desc = "This limb features sleek black and white polymers."
icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_main.dmi'
<<<<<<< HEAD
unavailable_to_build = 0 // CHOMP Edit
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/wardtakahashi_alt1
company = "Ward-Takahashi - Shroud"
@@ -537,15 +403,8 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
company = "Xion"
desc = "This limb has a minimalist black and red casing."
icon = 'icons/mob/human_races/cyberlimbs/xion/xion_main.dmi'
<<<<<<< HEAD
unavailable_to_build = 0 // CHOMP Edit
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
unavailable_to_build = 1
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/xion_alt1
company = "Xion - Breach"
@@ -565,24 +424,14 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
green=xion_green;\
blue=xion_blue;\
rgb=xion_rgb"
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/xion_alt3
company = "Xion - Whiteout"
desc = "This limb has a minimalist black and white casing."
icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt3.dmi'
unavailable_to_build = 1
<<<<<<< HEAD
||||||| parent of 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
modular_bodyparts = MODULAR_BODYPART_CYBERNETIC
=======
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
>>>>>>> 16e4f1ba4d... Merge pull request #9828 from Heroman3003/maximum-detachability
/datum/robolimb/xion_alt4
company = "Xion - Breach - Whiteout"
@@ -610,6 +459,14 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
skin_tone = 1
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC //VOREStation Edit - remove the restrictions
/datum/robolimb/wooden
company = "Morgan Trading Co"
desc = "A simplistic, metal-banded, wood-panelled prosthetic."
icon = 'icons/mob/human_races/cyberlimbs/prosthesis/wooden.dmi'
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC
parts = list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
modular_bodyparts = MODULAR_BODYPART_PROSTHETIC
/obj/item/weapon/disk/limb
name = "Limb Blueprints"
desc = "A disk containing the blueprints for prosthetics."