cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 20:57:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-10136

Browse Source
This commit is contained in:
Nadyr
2021-04-11 22:51:30 -04:00
committed by GitHub
parent 0d264df1f3 f31187f8a1
commit 2b021722f3
23 changed files with 73 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/suit_storage_unit.dm
+4 -1
View File
@@ -632,7 +632,7 @@
/obj/machinery/suit_cycler/exploration
name = "Explorer suit cycler"
model_text = "Exploration"
departments = list("Exploration","Old Exploration","No Change")
departments = list("Exploration","Expedition Medic","Old Exploration","No Change")
/obj/machinery/suit_cycler/exploration/Initialize()
species -= SPECIES_TESHARI
@@ -1113,6 +1113,9 @@
if("Exploration")
parent_helmet = /obj/item/clothing/head/helmet/space/void/exploration
parent_suit = /obj/item/clothing/suit/space/void/exploration
if("Expedition Medic")
parent_helmet = /obj/item/clothing/head/helmet/space/void/exploration_medical
parent_suit = /obj/item/clothing/suit/space/void/exploration_medical
if("Old Exploration")
parent_helmet = /obj/item/clothing/head/helmet/space/void/exploration/alt
parent_suit = /obj/item/clothing/suit/space/void/exploration/alt
code/modules/clothing/spacesuits/void/station.dm
+21 -1
View File
@@ -329,13 +329,33 @@
/obj/item/clothing/suit/space/void/exploration
name = "exploration voidsuit"
desc = "A lightweight, radiation-resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments."
desc = "A hazard and radiation resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments."
icon_state = "void_explorer"
item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black")
armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon, \
/obj/item/weapon/shovel,/obj/item/ammo_magazine,/obj/item/weapon/gun)
//SAR
/obj/item/clothing/head/helmet/space/void/exploration_medical
name = "exploration medic\'s voidsuit helmet"
desc = "A radiation-resistant helmet made especially for exploring unknown planetary environments. Has a reinforced high-vis bubble style visor."
icon_state = "helm_exp_medic"
item_state = "helm_exp_medic"
item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black")
armor = list(melee = 25, bullet = 10, laser = 20,energy = 30, bomb = 25, bio = 100, rad = 70)
light_overlay = "helmet_light_dual" //explorer_light
/obj/item/clothing/suit/space/void/exploration_medical
name = "exploration medic\'s voidsuit"
desc = "A hazard and radiation resistant voidsuit, featuring the Explorer emblem and a green cross on its chest plate. Seems to be a little lighter and more flexible than the regular explorer issue."
icon_state = "void_exp_medic"
slowdown = 0.75
item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black")
armor = list(melee = 25, bullet = 10, laser = 20,energy = 30, bomb = 25, bio = 100, rad = 70)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon, \
/obj/item/weapon/shovel,/obj/item/ammo_magazine,/obj/item/weapon/gun,/obj/item/weapon/storage/firstaid,/obj/item/stack/medical)
/obj/item/clothing/head/helmet/space/void/exploration/alt
desc = "A radiation-resistant helmet retrofitted for exploring unknown planetary environments."
icon_state = "helm_explorer2"
code/modules/mob/living/carbon/human/species/species_vr.dm
+18 -19
View File
@@ -23,6 +23,8 @@
var/silk_color = "#FFFFFF"
var/list/traits = list()
//Vars that need to be copied when producing a copy of species.
var/list/copy_vars = list("base_species", "icobase", "deform", "tail", "tail_animation", "icobase_tail", "color_mult", "primitive_form", "appearance_flags", "flesh_color", "base_color", "blood_mask", "damage_mask", "damage_overlays", "move_trail", "has_floating_eyes")
/datum/species/proc/give_numbing_bite() //Holy SHIT this is hacky, but it works. Updating a mob's attacks mid game is insane.
unarmed_attacks = list()
@@ -42,31 +44,19 @@
nif.nifsofts = nifsofts
else
..()
/datum/species/proc/produceCopy(var/list/traits,var/mob/living/carbon/human/H, var/custom_base)
var/datum/species/S
/datum/species/proc/produceCopy(var/list/traits,var/mob/living/carbon/human/H)
//If species allows custom base, and custom base is set, apply it, otherwise use default.
if(selects_bodytype && custom_base)
S = GLOB.all_species[custom_base]
else
S = GLOB.all_species[src.name]
ASSERT(S)
ASSERT(src)
ASSERT(istype(H))
var/datum/species/new_copy = new S.type()
var/datum/species/new_copy = new src.type()
for(var/i in S.vars) //Thorough copy of species.
if(new_copy.vars[i] != S.vars[i])
//Skipping lists because they may contain more lists, copy those manually.
//Also ignoring type var since it's read-only and will runtime.
if(islist(vars[i]))
continue
new_copy.vars[i] = S.vars[i]
if(selects_bodytype) //If race selects a bodytype, copy needed variables.
copy_variables(new_copy, copy_vars)
for(var/organ in S.has_limbs) //Copy important organ data generated by species.
var/list/organ_data = S.has_limbs[organ]
for(var/organ in has_limbs) //Copy important organ data generated by species.
var/list/organ_data = has_limbs[organ]
new_copy.has_limbs[organ] = organ_data.Copy()
new_copy.traits = traits
//If you had traits, apply them
if(new_copy.traits)
for(var/trait in new_copy.traits)
@@ -85,6 +75,15 @@
return new_copy
/datum/species/proc/copy_variables(var/datum/species/S, var/list/whitelist)
//List of variables to ignore, trying to copy type will runtime.
var/list/blacklist = list("type", "loc", "client", "ckey")
//Makes thorough copy of species datum.
for(var/i in vars)
if(S.vars[i] != vars[i] && !islist(vars[i])) //If vars are same, no point in copying.
if(whitelist && !(i in whitelist) && i in blacklist) //If whitelist is provided, only vars in the list will be copied.
continue
S.vars[i] = vars[i]
/datum/species/get_bodytype()
return base_species
code/modules/mob/living/carbon/human/species/station/blank_vr.dm
+2 -12
View File
@@ -48,25 +48,15 @@
/datum/species/custom/get_race_key()
var/datum/species/real = GLOB.all_species[base_species]
return real.race_key
<<<<<<< HEAD
/datum/species/custom/produceCopy(var/list/traits,var/mob/living/carbon/human/H)
. = ..()
||||||| parent of eabb487497... Merge pull request #10136 from Nyksia/tiny-hotfix
/datum/species/custom/produceCopy(var/list/traits,var/mob/living/carbon/human/H,var/custom_base)
. = ..()
if(selects_bodytype && custom_base)
var/datum/species/S = GLOB.all_species[custom_base]
S.copy_variables(., copy_vars)
=======
/datum/species/custom/produceCopy(var/list/traits,var/mob/living/carbon/human/H,var/custom_base)
. = ..(traits, H)
if(selects_bodytype && custom_base)
var/datum/species/S = GLOB.all_species[custom_base]
S.copy_variables(., copy_vars)
>>>>>>> eabb487497... Merge pull request #10136 from Nyksia/tiny-hotfix
H.maxHealth = H.species.total_health
H.hunger_rate = H.species.hunger_factor
return .
// Stub species overrides for shoving trait abilities into
code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
+1 -1
View File
@@ -148,7 +148,7 @@
/datum/trait/negative/lightweight
name = "Lightweight"
desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping. Think of it like a bowling ball versus a pin."
desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping. Think of it like a bowling ball versus a pin. (STOP TAKING THIS AS SECURITY! We're MRP, so expect to lose your junk immediately, especially in events. - Love, Admins)" //CHOMP Edit btw
cost = -2
var_changes = list("lightweight" = 1)
code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+27 -27
View File
@@ -34,27 +34,27 @@
/datum/trait/positive/nonconductive
name = "Non-Conductive"
desc = "Decreases your susceptibility to electric shocks by a 10% amount."
cost = 1 //This effects tasers!
var_changes = list("siemens_coefficient" = 0.9)
desc = "Decreases your susceptibility to electric shocks by a 25% amount." //CHOMP Edit
cost = 2 //This effects tasers!
var_changes = list("siemens_coefficient" = 0.75) //CHOMP Edit
/datum/trait/positive/nonconductive_plus
name = "Major Non-Conductive"
desc = "Decreases your susceptibility to electric shocks by a 25% amount."
cost = 2 //Let us not forget this effects tasers!
var_changes = list("siemens_coefficient" = 0.75)
desc = "Decreases your susceptibility to electric shocks by a 50% amount." //CHOMP Edit
cost = 3 //Let us not forget this effects tasers!
var_changes = list("siemens_coefficient" = 0.5) //CHOMP Edit
/datum/trait/positive/darksight
name = "Darksight"
desc = "Allows you to see a short distance in the dark."
desc = "Allows you to see a short distance in the dark and 10% more susceptible to flashes." //CHOMP Edit
cost = 1
var_changes = list("darksight" = 5, "flash_mod" = 1.1)
var_changes = list("darksight" = 3) //CHOMP Edit
/datum/trait/positive/darksight_plus
name = "Darksight (Major)"
desc = "Allows you to see in the dark for almost the whole screen."
desc = "Allows you to see in the dark for almost the whole screen and 20% more susceptible to flashes." //CHOMP Edit
cost = 2
var_changes = list("darksight" = 8, "flash_mod" = 1.2)
var_changes = list("darksight" = 6) //CHOMP Edit
/datum/trait/positive/melee_attack
name = "Sharp Melee"
@@ -76,29 +76,29 @@
/datum/trait/positive/minor_brute_resist
name = "Minor Brute Resist"
desc = "Adds 15% resistance to brute damage sources."
cost = 2
var_changes = list("brute_mod" = 0.85)
desc = "Adds 10% resistance to brute damage sources." //CHOMP Edit
cost = 1 //CHOMP Edit
var_changes = list("brute_mod" = 0.9) //CHOMP Edit
/datum/trait/positive/brute_resist
name = "Brute Resist"
desc = "Adds 25% resistance to brute damage sources."
cost = 3
var_changes = list("brute_mod" = 0.75)
excludes = list(/datum/trait/positive/minor_burn_resist,/datum/trait/positive/burn_resist)
desc = "Adds 20% resistance to brute damage sources." //CHOMP Edit
cost = 2 //CHOMP Edit
var_changes = list("brute_mod" = 0.8) //CHOMP Edit
//excludes = list(/datum/trait/positive/minor_burn_resist,/datum/trait/positive/burn_resist) //CHOMP disable, this is already handled in positive_ch.dm
/datum/trait/positive/minor_burn_resist
name = "Minor Burn Resist"
desc = "Adds 15% resistance to burn damage sources."
cost = 2
var_changes = list("burn_mod" = 0.85)
desc = "Adds 10% resistance to burn damage sources." //CHOMP Edit
cost = 1 //CHOMP Edit
var_changes = list("burn_mod" = 0.9) //CHOMP Edit
/datum/trait/positive/burn_resist
name = "Burn Resist"
desc = "Adds 25% resistance to burn damage sources."
cost = 3
var_changes = list("burn_mod" = 0.75)
excludes = list(/datum/trait/positive/minor_brute_resist,/datum/trait/positive/brute_resist)
desc = "Adds 20% resistance to burn damage sources." //CHOMP Edit
cost = 2 //CHOMP Edit
var_changes = list("burn_mod" = 0.8) //CHOMP Edit
//excludes = list(/datum/trait/positive/minor_brute_resist,/datum/trait/positive/brute_resist) //CHOMP disable, this is already handled in positive_ch.dm
//YW ADDITIONS START
/datum/trait/positive/improved_biocompat
@@ -118,9 +118,9 @@
/datum/trait/positive/photoresistant
name = "Photoresistant"
desc = "Decreases stun duration from flashes and other light-based stuns and disabilities by 20%"
desc = "Decreases stun duration from flashes and other light-based stuns and disabilities by 25%" //CHOMP Edit
cost = 1
var_changes = list("flash_mod" = 0.8)
var_changes = list("flash_mod" = 0.75) //CHOMP Edit
//YW add
/datum/trait/positive/photoresistant_plus
@@ -143,7 +143,7 @@
/datum/trait/positive/hardfeet
name = "Hard Feet"
desc = "Makes your nice clawed, scaled, hooved, armored, or otherwise just awfully calloused feet immune to glass shards."
cost = 0
cost = 1 //CHOMP Edit
var_changes = list("flags" = NO_MINOR_CUT) //Checked the flag is only used by shard stepping.
//CHOMPStation Removal Start