From 3a4fdfa727844ba34f574d72b2247b1fdbed3df5 Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Thu, 19 Jan 2023 21:46:13 -0800 Subject: [PATCH 01/11] Update miscellaneous_ch.dm Testing different values and variables on cohesion suits, which should be protective anyway. --- .../clothing/under/miscellaneous_ch.dm | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/code/modules/clothing/under/miscellaneous_ch.dm b/code/modules/clothing/under/miscellaneous_ch.dm index 0cafacd38a..cfc849681d 100644 --- a/code/modules/clothing/under/miscellaneous_ch.dm +++ b/code/modules/clothing/under/miscellaneous_ch.dm @@ -8,3 +8,23 @@ /obj/item/clothing/under/sexybunny_white/sexybunny_black icon_state = "sexybunny_black" + +/obj/item/clothing/under/cohesion/decal/test //Testing both at once. + water_protection = 1 + permeability_coefficient = 0 + +/obj/item/clothing/under/cohesion/striped/test + permeability_coefficient = 0 //Test for if this affects water or not. + +/obj/item/clothing/under/cohesion/hazard/test + water_protection = 1 //Test for if this even does anything, as it's referenced a bunch in the defense code and promethean code. + +/obj/item/clothing/under/cohesion/striped/testfull //testing both, but with full coverage. + water_protection = 1 + permeability_coefficient = 0 + body_parts_covered = HEAD|FACE|EYES|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + +/obj/item/clothing/under/cohesion/striped/testfull //testing both, but without as full coverage. + water_protection = 1 + permeability_coefficient = 0 + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS From c21175431cdc0531eab45751a1c5f1d27e17198a Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Thu, 19 Jan 2023 21:59:05 -0800 Subject: [PATCH 02/11] Update spacesuits.dm Zeros the permeability coefficient of space suits to test if it protects against rain and water. --- code/modules/clothing/spacesuits/spacesuits.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 5030bcfe01..4f9f4dfdf3 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -10,7 +10,7 @@ center_of_mass = null flags = PHORONGUARD item_flags = THICKMATERIAL | AIRTIGHT | ALLOW_SURVIVALFOOD - permeability_coefficient = 0.01 + permeability_coefficient = 0 //Chompedit was 0.01, zeroed to test protecting those who are vulnerable to water. armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES @@ -72,7 +72,7 @@ icon_state = "space" w_class = ITEMSIZE_HUGE // So you can't fit this in your bag and be prepared at all times. gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.02 + permeability_coefficient = 0 //Chompedit was 0.01, zeroed to test protecting those who are vulnerable to water. flags = PHORONGUARD item_flags = THICKMATERIAL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS From b457e78763f663e44d0285b0538dfcc9bbfddb81 Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Thu, 19 Jan 2023 22:02:51 -0800 Subject: [PATCH 03/11] Update miscellaneous_ch.dm Adjusts permeabiliy_coefficient to 0 on cohesion suits to be a permanent change, rather than a temporary one. --- code/modules/clothing/under/miscellaneous_ch.dm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/code/modules/clothing/under/miscellaneous_ch.dm b/code/modules/clothing/under/miscellaneous_ch.dm index cfc849681d..a6628e1931 100644 --- a/code/modules/clothing/under/miscellaneous_ch.dm +++ b/code/modules/clothing/under/miscellaneous_ch.dm @@ -9,22 +9,16 @@ /obj/item/clothing/under/sexybunny_white/sexybunny_black icon_state = "sexybunny_black" +/obj/item/clothing/under/cohesion + permeability_coefficient = 0 //Should have this anyway + /obj/item/clothing/under/cohesion/decal/test //Testing both at once. water_protection = 1 - permeability_coefficient = 0 - -/obj/item/clothing/under/cohesion/striped/test - permeability_coefficient = 0 //Test for if this affects water or not. - -/obj/item/clothing/under/cohesion/hazard/test - water_protection = 1 //Test for if this even does anything, as it's referenced a bunch in the defense code and promethean code. /obj/item/clothing/under/cohesion/striped/testfull //testing both, but with full coverage. water_protection = 1 - permeability_coefficient = 0 body_parts_covered = HEAD|FACE|EYES|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS -/obj/item/clothing/under/cohesion/striped/testfull //testing both, but without as full coverage. +/obj/item/clothing/under/cohesion/striped/testpartial //testing both, but without as full coverage. water_protection = 1 - permeability_coefficient = 0 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS From 12f536d5028a3d59a5658513171e6fdf2f818b06 Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Thu, 19 Jan 2023 22:28:26 -0800 Subject: [PATCH 04/11] Update miscellaneous_ch.dm water_protection doesn't exist, and is simply a calculation of species water resistance, however permeability of clothing absolutely affects it as I found in human_defense.dm --- code/modules/clothing/under/miscellaneous_ch.dm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/code/modules/clothing/under/miscellaneous_ch.dm b/code/modules/clothing/under/miscellaneous_ch.dm index a6628e1931..8a423f2a4a 100644 --- a/code/modules/clothing/under/miscellaneous_ch.dm +++ b/code/modules/clothing/under/miscellaneous_ch.dm @@ -12,13 +12,8 @@ /obj/item/clothing/under/cohesion permeability_coefficient = 0 //Should have this anyway -/obj/item/clothing/under/cohesion/decal/test //Testing both at once. - water_protection = 1 +/obj/item/clothing/under/cohesion/striped/testpartial //testing better coverage. + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS /obj/item/clothing/under/cohesion/striped/testfull //testing both, but with full coverage. - water_protection = 1 - body_parts_covered = HEAD|FACE|EYES|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - -/obj/item/clothing/under/cohesion/striped/testpartial //testing both, but without as full coverage. - water_protection = 1 - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS From 1c447bd7aff035720975e2a16388e47020379323 Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Sun, 22 Jan 2023 17:05:11 -0800 Subject: [PATCH 05/11] Update energy.dm Discussion with Raz, increased range on phase weapons. --- code/modules/projectiles/projectile/energy.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 6caa1d5070..8fd06c93aa 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -285,24 +285,24 @@ /obj/item/projectile/energy/phase name = "phase wave" icon_state = "phase" - range = 6 + range = 13 //Chompedit This range was still awful damage = 5 SA_bonus_damage = 45 // 50 total on animals SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION, MOB_CLASS_HUMANOID) //CHOMP Edit expand this list hud_state = "laser_heat" /obj/item/projectile/energy/phase/light - range = 4 + range = 11 //Chompedit This range was absolutely pathetic SA_bonus_damage = 35 // 40 total on animals hud_state = "laser_heat" /obj/item/projectile/energy/phase/heavy - range = 8 + range = 16 //Chompedit This range was not great SA_bonus_damage = 55 // 60 total on animals hud_state = "laser_heat" /obj/item/projectile/energy/phase/heavy/cannon - range = 10 + range = 20 //Chompedit This range was mediocre, but not worth a cannon. damage = 15 SA_bonus_damage = 60 // 75 total on animals hud_state = "laser_heat" @@ -330,4 +330,4 @@ /obj/item/projectile/energy/flash/flare flash_range = 2 - hud_state = "grenade_dummy" \ No newline at end of file + hud_state = "grenade_dummy" From ba133b2db072cc556144645367042801fd9ac5a8 Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Sun, 22 Jan 2023 18:27:37 -0800 Subject: [PATCH 06/11] Update phase.dm Reduced phase weapon charge cost across the board. --- code/modules/projectiles/guns/energy/phase.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/energy/phase.dm b/code/modules/projectiles/guns/energy/phase.dm index 179355a167..33ce608437 100644 --- a/code/modules/projectiles/guns/energy/phase.dm +++ b/code/modules/projectiles/guns/energy/phase.dm @@ -10,7 +10,7 @@ item_state = "phasecarbine" wielded_item_state = "phasecarbine-wielded" slot_flags = SLOT_BACK|SLOT_BELT - charge_cost = 240 + charge_cost = 80 //Chompedit Bringing charge cost down for all phase weapons. projectile_type = /obj/item/projectile/energy/phase one_handed_penalty = 15 recoil_mode = 0 //CHOMP Addition: Removes recoil for micros. @@ -27,8 +27,8 @@ one_handed_penalty = 0 /obj/item/weapon/gun/energy/locked/phasegun/unlocked/mounted/cyborg - charge_cost = 200 //ChompEdit Reduced from 480 to 200 - recharge_time = 5 //ChompEdit Reduced from 7 to 5 + charge_cost = 80 //ChompEdit Reduced from 480 to 200, further reduced to 80 to match normal phase guns + recharge_time = 10 //ChompEdit set up to 10 due to lower charge cost /obj/item/weapon/gun/energy/locked/phasegun/pistol name = "phase pistol" @@ -37,7 +37,7 @@ item_state = "taser" //I don't have an in-hand sprite, taser will be fine w_class = ITEMSIZE_NORMAL slot_flags = SLOT_BELT|SLOT_HOLSTER - charge_cost = 300 + charge_cost = 96 //Chompedit Bringing charge cost down for all phase weapons. projectile_type = /obj/item/projectile/energy/phase/light one_handed_penalty = 0 move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0 @@ -54,7 +54,7 @@ use_external_power = 1 /obj/item/weapon/gun/energy/locked/phasegun/pistol/unlocked/mounted/cyborg - charge_cost = 400 + charge_cost = 96 //Chompedit, bringing in line with normal phase weapons recharge_time = 7 @@ -66,7 +66,7 @@ wielded_item_state = "phaserifle-wielded" w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK - charge_cost = 150 + charge_cost = 68 //Chompedit Bringing charge cost down for all phase weapons. projectile_type = /obj/item/projectile/energy/phase/heavy accuracy = 15 one_handed_penalty = 30 @@ -85,7 +85,7 @@ wielded_item_state = "phasecannon-wielded" //TODO: New Sprites w_class = ITEMSIZE_HUGE // This thing is big. slot_flags = SLOT_BACK - charge_cost = 100 + charge_cost = 60 //Chompedit Bringing charge cost down for all phase weapons. projectile_type = /obj/item/projectile/energy/phase/heavy/cannon accuracy = 15 one_handed_penalty = 65 From 4a69a6ae95a37beea2ebd533ce6820706ef0b977 Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Thu, 9 Feb 2023 23:39:11 -0800 Subject: [PATCH 07/11] Update telecube.dm Minor fix to the techs given by Locii. --- code/modules/artifice/telecube.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/artifice/telecube.dm b/code/modules/artifice/telecube.dm index 2b30456094..713903a10b 100644 --- a/code/modules/artifice/telecube.dm +++ b/code/modules/artifice/telecube.dm @@ -24,7 +24,7 @@ icon = 'icons/obj/props/telecube.dmi' icon_state = "cube" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MATERIAL = 7, TECH_POWER = 6, TECH_BLUESPACE = 7, TECH_ANOMALY = 2, TECH_PRECURSOR = 2) + origin_tech = list(TECH_MATERIAL = 7, TECH_POWER = 6, TECH_BLUESPACE = 7, TECH_ARCANE = 2, TECH_PRECURSOR = 2) catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/telecube) From a99919c5d8eef654f3d6167528c5c6990a4a1543 Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Sat, 11 Feb 2023 00:08:04 -0800 Subject: [PATCH 08/11] Update rig.dm Zeroed permeability coeficient --- code/modules/clothing/spacesuits/rig/rig.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 441c584dd1..2f472212c8 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -22,7 +22,7 @@ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.2 - permeability_coefficient = 0.1 + permeability_coefficient = 0 //Zeroed this out to protect people vulnerable to water, which definitely shouldn't get through these suits. unacidable = TRUE preserve_item = 1 From 81bbe0c33b2cfab99389880ba4c0ababc22b8525 Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Sat, 11 Feb 2023 00:33:36 -0800 Subject: [PATCH 09/11] Update rig.dm Adds permeability to modular chomp instead. --- modular_chomp/code/modules/clothing/spacesuits/rig/rig.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_chomp/code/modules/clothing/spacesuits/rig/rig.dm b/modular_chomp/code/modules/clothing/spacesuits/rig/rig.dm index e44a2608e2..32e48f1c74 100644 --- a/modular_chomp/code/modules/clothing/spacesuits/rig/rig.dm +++ b/modular_chomp/code/modules/clothing/spacesuits/rig/rig.dm @@ -1,3 +1,4 @@ /obj/item/weapon/rig var/protean = 0 - var/obj/item/weapon/storage/backpack/rig_storage \ No newline at end of file + var/obj/item/weapon/storage/backpack/rig_storage + permeability_coefficient = 0 //Protect the squishies, after all this shit should be waterproof. From bd86c90c5dcd31b3f687da79043a72fc057202bf Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Sat, 11 Feb 2023 00:35:12 -0800 Subject: [PATCH 10/11] Create rig.dm Undoes what I was doing here, moving it to modular chomp. --- code/modules/clothing/spacesuits/rig/rig.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 2f472212c8..441c584dd1 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -22,7 +22,7 @@ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.2 - permeability_coefficient = 0 //Zeroed this out to protect people vulnerable to water, which definitely shouldn't get through these suits. + permeability_coefficient = 0.1 unacidable = TRUE preserve_item = 1 From 152582a17e7ec3f390e31b88257b7a6501480fbd Mon Sep 17 00:00:00 2001 From: Cyrelius <69184203+Cyrelius@users.noreply.github.com> Date: Sat, 11 Feb 2023 21:16:16 -0800 Subject: [PATCH 11/11] Update phase.dm Reverting changes on this branch, as it shouldn't have them. --- code/modules/projectiles/guns/energy/phase.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/energy/phase.dm b/code/modules/projectiles/guns/energy/phase.dm index 33ce608437..179355a167 100644 --- a/code/modules/projectiles/guns/energy/phase.dm +++ b/code/modules/projectiles/guns/energy/phase.dm @@ -10,7 +10,7 @@ item_state = "phasecarbine" wielded_item_state = "phasecarbine-wielded" slot_flags = SLOT_BACK|SLOT_BELT - charge_cost = 80 //Chompedit Bringing charge cost down for all phase weapons. + charge_cost = 240 projectile_type = /obj/item/projectile/energy/phase one_handed_penalty = 15 recoil_mode = 0 //CHOMP Addition: Removes recoil for micros. @@ -27,8 +27,8 @@ one_handed_penalty = 0 /obj/item/weapon/gun/energy/locked/phasegun/unlocked/mounted/cyborg - charge_cost = 80 //ChompEdit Reduced from 480 to 200, further reduced to 80 to match normal phase guns - recharge_time = 10 //ChompEdit set up to 10 due to lower charge cost + charge_cost = 200 //ChompEdit Reduced from 480 to 200 + recharge_time = 5 //ChompEdit Reduced from 7 to 5 /obj/item/weapon/gun/energy/locked/phasegun/pistol name = "phase pistol" @@ -37,7 +37,7 @@ item_state = "taser" //I don't have an in-hand sprite, taser will be fine w_class = ITEMSIZE_NORMAL slot_flags = SLOT_BELT|SLOT_HOLSTER - charge_cost = 96 //Chompedit Bringing charge cost down for all phase weapons. + charge_cost = 300 projectile_type = /obj/item/projectile/energy/phase/light one_handed_penalty = 0 move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0 @@ -54,7 +54,7 @@ use_external_power = 1 /obj/item/weapon/gun/energy/locked/phasegun/pistol/unlocked/mounted/cyborg - charge_cost = 96 //Chompedit, bringing in line with normal phase weapons + charge_cost = 400 recharge_time = 7 @@ -66,7 +66,7 @@ wielded_item_state = "phaserifle-wielded" w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK - charge_cost = 68 //Chompedit Bringing charge cost down for all phase weapons. + charge_cost = 150 projectile_type = /obj/item/projectile/energy/phase/heavy accuracy = 15 one_handed_penalty = 30 @@ -85,7 +85,7 @@ wielded_item_state = "phasecannon-wielded" //TODO: New Sprites w_class = ITEMSIZE_HUGE // This thing is big. slot_flags = SLOT_BACK - charge_cost = 60 //Chompedit Bringing charge cost down for all phase weapons. + charge_cost = 100 projectile_type = /obj/item/projectile/energy/phase/heavy/cannon accuracy = 15 one_handed_penalty = 65