diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm index 53bd48bc35..4a8cc06180 100644 --- a/code/game/objects/effects/alien/aliens.dm +++ b/code/game/objects/effects/alien/aliens.dm @@ -38,17 +38,17 @@ var/obj/effect/alien/weeds/node/linked_node = null var/static/list/weedImageCache -/obj/effect/alien/weeds/Initialize(var/mapload, var/node, var/newcolor) +/obj/effect/alien/weeds/Initialize(var/mapload, var/node) // CHOMPedit: No coloration. . = ..() if(isspace(loc)) return INITIALIZE_HINT_QDEL linked_node = node - if(newcolor) - color = newcolor +// if(newcolor) +// color = newcolor // CHOMPedit: No coloration. if(icon_state == "weeds") - icon_state = pick("weeds", "weeds1", "weeds2") + icon_state = pick("weeds", "weeds1", "weeds2", "weeds3", "weeds4", "weeds5", "weeds6", "weeds7", "weeds8", "weeds9", "weeds10", "weeds11", "weeds12", "weeds13", "weeds14", "weeds15") // CHOMPedit: More icons variants. fullUpdateWeedOverlays() @@ -73,9 +73,9 @@ light_color = "#673972" var/node_range = NODERANGE - var/set_color = "#321D37" +// var/set_color = "#321D37" // CHOMPedit: Removing coloration. -/obj/effect/alien/weeds/node/Initialize(var/mapload, var/node, var/newcolor) +/obj/effect/alien/weeds/node/Initialize(var/mapload, var/node) // CHOMPedit: Removing coloration. . = ..() for(var/obj/effect/alien/weeds/existing in loc) @@ -86,10 +86,10 @@ linked_node = src - if(newcolor) - set_color = newcolor - if(set_color) - color = set_color +// if(newcolor) +// set_color = newcolor +// if(set_color) +// color = set_color // CHOMPedit: Removing coloration. START_PROCESSING(SSobj, src) // Only the node processes in a subsystem, the rest are process()'d by the node @@ -151,7 +151,7 @@ if(T1.c_airblock(T2) == BLOCKED) continue - new /obj/effect/alien/weeds(T2, linked_node, color) + new /obj/effect/alien/weeds(T2, linked_node) // CHOMPedit: No coloration. /obj/effect/alien/weeds/node/process() set background = 1 @@ -166,7 +166,7 @@ if(!W.linked_node) W.linked_node = src - W.color = W.linked_node.set_color +// W.color = W.linked_node.set_color // CHOMPedit: No coloration. if(prob(max(10, 60 - (5 * nearby_weeds.len)))) W.process() @@ -225,7 +225,7 @@ healthcheck() // CHOMPedit start - Smaller-ranged nodes for Xenomorph Hybrids, node/weed deletion. -/obj/effect/alien/weeds/attack_hand() +/obj/effect/alien/weeds/attack_hand(mob/user as mob) usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if (HULK in usr.mutations) visible_message("[usr] destroys the [name]!") @@ -234,14 +234,13 @@ // Aliens can get straight through these. if(istype(usr,/mob/living/carbon)) - var/mob/living/carbon/M = usr - if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) - visible_message ("[usr] strokes the [name] and it melts away!", 1) - health = 0 - healthcheck() - return - visible_message("[usr] claws at the [name]!") - health -= rand(5,10) + if(user.a_intent == I_HURT) + var/mob/living/carbon/M = usr + if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) + visible_message ("[usr] strokes the [name] and it melts away!", 1) + health = 0 + healthcheck() + return healthcheck() return diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 61d6a13bf4..67c5c169c2 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -249,7 +249,8 @@ /obj/item/device/flashlight, /obj/item/weapon/cell/device, /obj/item/weapon/extinguisher/mini, - /obj/item/weapon/storage/quickdraw/syringe_case + /obj/item/weapon/storage/quickdraw/syringe_case, + /obj/item/ammo_casing/macrobattery // CHOMPedit: Macrobatteries for the Curabitur can fit into medbelts. ) /obj/item/weapon/storage/belt/medical/emt diff --git a/code/game/objects/structures/alien/alien.dm b/code/game/objects/structures/alien/alien.dm index 0979677fde..ecff7a2763 100644 --- a/code/game/objects/structures/alien/alien.dm +++ b/code/game/objects/structures/alien/alien.dm @@ -66,7 +66,7 @@ ..() return -/obj/structure/alien/attack_hand() +/obj/structure/alien/attack_hand(mob/user as mob) usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if (HULK in usr.mutations) visible_message("[usr] destroys the [name]!") @@ -75,14 +75,13 @@ // Aliens can get straight through these. if(istype(usr,/mob/living/carbon)) - var/mob/living/carbon/M = usr - if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) - visible_message ("[usr] strokes the [name] and it melts away!", 1) - health = 0 - healthcheck() - return - visible_message("[usr] claws at the [name]!") - health -= rand(5,10) + if(user.a_intent == I_HURT) + var/mob/living/carbon/M = usr + if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) + visible_message ("[usr] strokes the [name] and it melts away!", 1) + health = 0 + healthcheck() + return healthcheck() return diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm index 62b8bc1703..2a6e89305b 100644 --- a/code/game/objects/structures/simple_doors.dm +++ b/code/game/objects/structures/simple_doors.dm @@ -283,3 +283,30 @@ if(!iscultist(L) && !istype(L, /mob/living/simple_mob/construct)) return ..() + +// CHOMPedit start: Allows removing resin doors. +/obj/structure/simple_door/resin/attack_hand(mob/user as mob) + usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) + if (HULK in usr.mutations) + visible_message("[usr] destroys the [name]!") + hardness = 0 + else + + // Carbons can get straight through these. + if(istype(usr,/mob/living/carbon)) + if(user.a_intent == I_HURT) + var/mob/living/carbon/M = usr + if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) + visible_message ("[usr] strokes the [name] and it melts away!", 1) + hardness = 0 + CheckHardness() + return + else + visible_message("[usr] tears at the [name]!") + hardness -= 2 + CheckHardness() + return + CheckHardness() + TryToSwitchState(user) + return +// CHOMPedit end. \ No newline at end of file diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index c08a9d1951..2793ea7090 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -84,3 +84,24 @@ density = FALSE qdel(src) return + +// CHOMPedit start - Allows xenos to clean nests. +/obj/structure/bed/nest/attack_hand(mob/user as mob) + usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) + if (HULK in usr.mutations) + visible_message("[usr] destroys the [name]!") + health = 0 + else + + // Aliens can get straight through these. + if(istype(usr,/mob/living/carbon)) + if(user.a_intent == I_HURT) + var/mob/living/carbon/M = usr + if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) + visible_message ("[usr] strokes the [name] and it melts away!", 1) + health = 0 + healthcheck() + return + healthcheck() + return +// CHOMPedit end. \ No newline at end of file diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index ca99402a54..bcd291ce26 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -325,6 +325,12 @@ ) drop_sound = 'sound/items/drop/gloves.ogg' pickup_sound = 'sound/items/pickup/gloves.ogg' +// CHOMPedit start: All gloves give cold/heat protection. + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE +// CHOMPedit end. /obj/item/clothing/proc/set_clothing_index() return diff --git a/code/modules/materials/materials/organic/resin.dm b/code/modules/materials/materials/organic/resin.dm index 68ac510947..ea07be6ad2 100644 --- a/code/modules/materials/materials/organic/resin.dm +++ b/code/modules/materials/materials/organic/resin.dm @@ -1,7 +1,9 @@ /datum/material/resin name = "resin" - icon_colour = "#353C40" // CHOMPedit: Alternative colour to distinguish from weed floor tiles. +// icon_colour = "#353C40" // CHOMPedit: No longer needed icon_base = "resin" + integrity = 50 // CHOMPedit: Same as wood. + hardness = 15 // CHOMPedit: Same as wood. table_icon_base = "stone" dooropen_noise = 'sound/effects/attackblob.ogg' door_icon_base = "resin" @@ -38,7 +40,7 @@ new /datum/stack_recipe("[display_name] door", /obj/structure/simple_door/resin, 1, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), // CHOMPedit: Reduced material cost. new /datum/stack_recipe("[display_name] barricade", /obj/structure/alien/wall, 1, time = 5 SECONDS, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), // CHOMPedit: Reduced material cost. new /datum/stack_recipe("[display_name] nest", /obj/structure/bed/nest, 1, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), // CHOMPedit: Reduced material cost. - new /datum/stack_recipe("[display_name] wall girders", /obj/structure/girder/resin, 1, time = 5 SECONDS, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), // CHOMPedit: Reduced material cost. +// new /datum/stack_recipe("[display_name] wall girders", /obj/structure/girder/resin, 1, time = 5 SECONDS, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), // CHOMPedit: Removed, build walls with secrete resin new /datum/stack_recipe("crude [display_name] bandage", /obj/item/stack/medical/crude_pack, 2, time = 2 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), // CHOMPedit: Increased material cost. new /datum/stack_recipe("[display_name] net", /obj/item/weapon/material/fishing_net, 2, time = 5 SECONDS, supplied_material = "[name]", pass_stack_color = TRUE), // CHOMPedit: Reduced material cost. new /datum/stack_recipe("[display_name] membrane", /obj/structure/alien/membrane, 1, time = 2 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm index 284f4fc5d8..ac2e2a79b5 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm @@ -270,7 +270,7 @@ if(O) visible_message("[src] vomits up a thick purple substance and begins to shape it!", "You shape a [choice].") - O.color = "#321D37" +// O.color = "#321D37" // CHOMPedit: Removing colouration, adding predefined colour icons. playsound(src, 'sound/effects/blobattack.ogg', 40, 1) return diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm index b96d224a04..499d7b6417 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm @@ -40,7 +40,7 @@ disable_duration_percent = 0.7 outgoing_melee_damage_percent = 1.3 - attack_speed_percent = -1.3 // CHOMPedit: It was actually slowing it down, lol + attack_speed_percent = 0.7 // CHOMPedit: It was actually slowing it down, lol accuracy = 30 slowdown = -1 evasion = 30 diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm index 513311313e..bb27ff2186 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm @@ -21,6 +21,7 @@ item_state = "multicannon" slot_flags = SLOT_BACK recoil = FALSE + fire_sound = 'modular_chomp/sound/weapons/energy/laser_strong.ogg' // CHOMPedit: New firesound, overwrites the sfx from the macrobatteries. /obj/item/weapon/gun/projectile/multi_cannon/update_icon() . = ..() diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 7c66961ab3..872ffd1868 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -913,8 +913,26 @@ else if(istype(I,/obj/item/weapon/newspaper)) to_chat(src, "You can taste the dry flavor of garbage, oh wait its just the news.") else if (istype(I,/obj/item/weapon/cell)) - visible_message("[src] sates their electric appeite with a [I]!") + visible_message("[src] sates their electric appetite with a [I]!") to_chat(src, "You can taste the spicy flavor of electrolytes, yum.") + else if (istype(I,/obj/item/device/walkpod)) + visible_message("[src] sates their musical appetite with a [I]!") + to_chat(src, "You can taste the jazzy flavor of music.") + else if (istype(I,/obj/item/mail/junkmail)) + visible_message("[src] devours the [I]!") + to_chat(src, "You can taste the flavor of the galactic postal service.") + else if (istype(I,/obj/item/weapon/gun/energy/sizegun)) + visible_message("[src] devours the [I]!") + to_chat(src, "You didn't read the warning label, did you?") + else if (istype(I,/obj/item/device/slow_sizegun)) + visible_message("[src] devours the [I]!") + to_chat(src, "You taste the flavor of sunday driver bluespace.") + else if (istype(I,/obj/item/device/laser_pointer)) + visible_message("[src] devours the [I]!") + to_chat(src, "You taste the flavor of a laser.") + else if (istype(I,/obj/item/canvas)) + visible_message("[src] devours the [I]!") + to_chat(src, "You taste the flavor of priceless artwork.") //CHOMPedit end else diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi index 40990afe12..0ac579f332 100644 Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ diff --git a/icons/obj/doors/material_doors.dmi b/icons/obj/doors/material_doors.dmi index da1780ff8b..e233c42b32 100644 Binary files a/icons/obj/doors/material_doors.dmi and b/icons/obj/doors/material_doors.dmi differ diff --git a/icons/obj/stacks_ch.dmi b/icons/obj/stacks_ch.dmi index 94ea395051..df91e1127d 100644 Binary files a/icons/obj/stacks_ch.dmi and b/icons/obj/stacks_ch.dmi differ diff --git a/modular_chomp/code/datums/components/xenoqueen.dm b/modular_chomp/code/datums/components/xenoqueen.dm index 4b03178beb..afa8af4173 100644 --- a/modular_chomp/code/datums/components/xenoqueen.dm +++ b/modular_chomp/code/datums/components/xenoqueen.dm @@ -33,7 +33,7 @@ mob_overlay_state = "purple_electricity_constant" outgoing_melee_damage_percent = 1.2 // Only affects melee weapons, not fists - attack_speed_percent = -1.2 // Increases attack speed by 20% + attack_speed_percent = 0.9 // Increases attack speed by 10% evasion = 25 // Only affects ranged attacks missing /datum/modifier/aura/xenoqueenbuff/check_if_valid() diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm index ffcab2bf6f..e7c1c7d122 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm @@ -272,7 +272,7 @@ if(O) visible_message("[src] vomits up a thick purple substance and begins to shape it!", "You shape a [choice].") - O.color = "#321D37" +// O.color = "#321D37" // Adding predefined colour icons. playsound(src, 'sound/effects/blobattack.ogg', 40, 1) return diff --git a/modular_chomp/sound/weapons/energy/laser_strong.ogg b/modular_chomp/sound/weapons/energy/laser_strong.ogg new file mode 100644 index 0000000000..1fc399265d Binary files /dev/null and b/modular_chomp/sound/weapons/energy/laser_strong.ogg differ