From ef3df2752817e4ae5d8177365ad74c685bfe7a2d Mon Sep 17 00:00:00 2001 From: Leshana Date: Sat, 17 Feb 2018 00:36:12 -0500 Subject: [PATCH] VOREStation Specific Merge Changes * PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004 * Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters * Keep lights on explorer hoods * Don't map in anti-xeno tasers from Polaris lore. --- code/game/objects/random/random_vr.dm | 2 +- .../structures/crates_lockers/closets/l3closet.dm | 2 +- code/game/objects/structures/trash_pile.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 1 + code/modules/mob/living/carbon/human/update_icons.dm | 2 +- .../mob/living/silicon/robot/robot_modules/station.dm | 2 +- code/modules/organs/internal/eyes.dm | 6 ++++-- code/modules/organs/internal/organ_internal_vr.dm | 11 ----------- code/modules/organs/subtypes/machine.dm | 4 ++-- code/modules/projectiles/guns/energy/special.dm | 2 +- maps/tether/submaps/tether_misc.dmm | 10 +++++----- vorestation.dme | 1 - 12 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 code/modules/organs/internal/organ_internal_vr.dm diff --git a/code/game/objects/random/random_vr.dm b/code/game/objects/random/random_vr.dm index 9f2b0bb3930..7b7b25379f7 100644 --- a/code/game/objects/random/random_vr.dm +++ b/code/game/objects/random/random_vr.dm @@ -152,7 +152,7 @@ prob(4);/obj/item/weapon/storage/pill_bottle/zoom,\ prob(4);/obj/item/weapon/material/butterfly,\ prob(2);/obj/item/weapon/material/butterfly/switchblade,\ - prob(2);/obj/item/weapon/material/knuckledusters,\ + prob(2);/obj/item/clothing/gloves/knuckledusters,\ prob(2);/obj/item/weapon/reagent_containers/syringe/drugs,\ prob(1);/obj/item/weapon/material/knife/tacknife,\ prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,\ diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm index 4074230d8d7..c648a7c4827 100644 --- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm @@ -38,7 +38,7 @@ ..() new /obj/item/clothing/suit/bio_suit/security(src) new /obj/item/clothing/head/bio_hood/security(src) - new /obj/item/weapon/gun/energy/taser/xeno/sec(src) + // new /obj/item/weapon/gun/energy/taser/xeno/sec(src) // VOREStation Edit - We don't need these /obj/structure/closet/l3closet/janitor icon_state = "bio_janitor" diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index 7480dce28af..83fbc013780 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -224,7 +224,7 @@ prob(4);/obj/item/weapon/gun/energy/sizegun, prob(3);/obj/item/weapon/material/butterfly, prob(3);/obj/item/weapon/material/butterfly/switchblade, - prob(3);/obj/item/weapon/material/knuckledusters, + prob(3);/obj/item/clothing/gloves/knuckledusters, prob(3);/obj/item/weapon/reagent_containers/syringe/drugs, prob(2);/obj/item/weapon/handcuffs/fuzzy, // prob(2);/obj/item/weapon/legcuffs, diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 5a3483f9c73..ea95109f405 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -798,6 +798,7 @@ obj/item/clothing/suit/storage/toggle/peacoat name = "explorer hood" desc = "An armoured hood for exploring harsh environments." icon_state = "explorer" + brightness_on = 3 // VOREStation Edit - Keep hood light for now - TODO Drain power body_parts_covered = HEAD cold_protection = HEAD flags = THICKMATERIAL diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 10d599593ad..03cdb4306e6 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -265,7 +265,7 @@ Please contact me on #coderbus IRC. ~Carn x else if(!typing_indicator && hud_typing) //Are they in their body, NOT dead, have hud_typing, do NOT have a typing indicator. and have it enabled? typing_indicator = new - typing_indicator.icon = 'icons/mob/talk.dmi' + typing_indicator.icon = 'icons/mob/talk_vr.dmi' //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons typing_indicator.icon_state = "[speech_bubble_appearance()]_typing" overlays += typing_indicator list_huds += typing_indicator diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 1b98786f044..f77637aa05b 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -512,7 +512,7 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/weapon/handcuffs/cyborg(src) src.modules += new /obj/item/weapon/melee/baton/robot(src) src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src) - src.modules += new /obj/item/weapon/gun/energy/taser/xeno/sec/robot(src) + // src.modules += new /obj/item/weapon/gun/energy/taser/xeno/sec/robot(src) // VOREStation Edit - We don't need these src.modules += new /obj/item/taperoll/police(src) src.modules += new /obj/item/weapon/reagent_containers/spray/pepper(src) src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm index 77350a73db8..6bcd67440de 100644 --- a/code/modules/organs/internal/eyes.dm +++ b/code/modules/organs/internal/eyes.dm @@ -95,5 +95,7 @@ return -1 /obj/item/organ/internal/eyes/emp_act(severity) - ..() //Returns if the organ isn't robotic - owner.eye_blurry += (4/severity) \ No newline at end of file + // ..() //Returns if the organ isn't robotic // VOREStation Edit - Don't take damage + if(!(robotic >= ORGAN_ASSISTED)) + return + owner.eye_blurry += (4/severity) diff --git a/code/modules/organs/internal/organ_internal_vr.dm b/code/modules/organs/internal/organ_internal_vr.dm deleted file mode 100644 index 66df7193f0b..00000000000 --- a/code/modules/organs/internal/organ_internal_vr.dm +++ /dev/null @@ -1,11 +0,0 @@ -/obj/item/organ/internal/eyes/emp_act(severity) - if(!(robotic >= ORGAN_ASSISTED)) - return - owner.eye_blurry += (4/severity) - -/obj/item/organ/internal/cell/emp_act(severity) - owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity)) - -/obj/item/organ/internal/mmi_holder/emp_act(severity) - owner.adjustToxLoss(rand(6/severity, 12/severity)) - diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm index 32c0e4b2b9f..0397a4e172d 100644 --- a/code/modules/organs/subtypes/machine.dm +++ b/code/modules/organs/subtypes/machine.dm @@ -18,7 +18,7 @@ owner.visible_message("\The [owner] twitches visibly!") /obj/item/organ/internal/cell/emp_act(severity) - ..() + // ..() // VOREStation Edit - Don't take damage owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity)) // Used for an MMI or posibrain being installed into a human. @@ -88,7 +88,7 @@ qdel(src) /obj/item/organ/internal/mmi_holder/emp_act(severity) - ..() + // ..() // VOREStation Edit - Don't take damage owner.adjustToxLoss(rand(6/severity, 12/severity)) /obj/item/organ/internal/mmi_holder/posibrain diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index d574938d98d..dfd9663fc70 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -22,7 +22,7 @@ force = 5 slot_flags = SLOT_BELT|SLOT_HOLSTER charge_cost = 480 - projectile_type = /obj/item/projectile/ion/pistol + projectile_type = /obj/item/projectile/ion/pistol // still packs a punch but no AoE /obj/item/weapon/gun/energy/phasegun name = "phase pistol" diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index 4dcffa219a7..c3ff728eee4 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -9401,11 +9401,11 @@ }, /area/antag/antag_base) "tD" = ( -/obj/item/weapon/material/knuckledusters, -/obj/item/weapon/material/knuckledusters, -/obj/item/weapon/material/knuckledusters, -/obj/item/weapon/material/knuckledusters, -/obj/item/weapon/material/knuckledusters, +/obj/item/clothing/gloves/knuckledusters, +/obj/item/clothing/gloves/knuckledusters, +/obj/item/clothing/gloves/knuckledusters, +/obj/item/clothing/gloves/knuckledusters, +/obj/item/clothing/gloves/knuckledusters, /obj/structure/table/steel, /obj/effect/floor_decal/borderfloorblack{ dir = 6 diff --git a/vorestation.dme b/vorestation.dme index 1c4650ba0b8..8502a5e34a0 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2241,7 +2241,6 @@ #include "code\modules\organs\internal\liver.dm" #include "code\modules\organs\internal\lungs.dm" #include "code\modules\organs\internal\organ_internal.dm" -#include "code\modules\organs\internal\organ_internal_vr.dm" #include "code\modules\organs\subtypes\diona.dm" #include "code\modules\organs\subtypes\machine.dm" #include "code\modules\organs\subtypes\seromi.dm"