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) 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 diff --git a/code/modules/clothing/under/miscellaneous_ch.dm b/code/modules/clothing/under/miscellaneous_ch.dm index 0cafacd38a..8a423f2a4a 100644 --- a/code/modules/clothing/under/miscellaneous_ch.dm +++ b/code/modules/clothing/under/miscellaneous_ch.dm @@ -8,3 +8,12 @@ /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/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. + body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS 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" 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.