diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 3385e9cdcb0..c432ab8f1f4 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -294,6 +294,7 @@ GLOBAL_LIST_INIT(wood_recipes, list( icon_state = "sheet-wood" gender = PLURAL singular_name = "wood plank" + materials = list(MAT_WOOD = MINERAL_MATERIAL_AMOUNT) origin_tech = "materials=1;biotech=1" resistance_flags = FLAMMABLE armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 0) @@ -823,7 +824,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list( GLOBAL_LIST_INIT(silk_recipes, list( new /datum/stack_recipe("cloth", /obj/item/stack/sheet/cloth, 1, 3, 6), new /datum/stack_recipe("collective jumpsuit", /obj/item/clothing/under/skulk/skulkcasual, 3, on_floor = TRUE) - )) +)) /obj/item/stack/sheet/silk name = "silk spool" diff --git a/code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm b/code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm index 83fc300279a..c807697a5b8 100644 --- a/code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm +++ b/code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm @@ -115,8 +115,9 @@ GLOBAL_LIST_EMPTY(flame_effects) merging_flame.fizzle() /obj/effect/fire/proc/damage_mob(mob/living/mob_to_burn) - if(!istype(mob_to_burn)) + if(!istype(mob_to_burn) || HAS_TRAIT(mob_to_burn, TRAIT_RESISTHEAT)) return + var/fire_damage = temperature / 100 if(ishuman(mob_to_burn)) var/mob/living/carbon/human/human_to_burn = mob_to_burn diff --git a/code/modules/economy/merch_items.dm b/code/modules/economy/merch_items.dm index e4c35e4fccd..1344ad8021a 100644 --- a/code/modules/economy/merch_items.dm +++ b/code/modules/economy/merch_items.dm @@ -230,7 +230,7 @@ category = MERCH_CAT_DECORATION /datum/merch_item/flag_skulk - name = "Nian Flag" + name = "Skkulakin Flag" desc = "The foreboding flag of the Silver Collective. Blessed by Skkula-Kkavan priests." typepath = /obj/item/flag/species/skulk cost = 500 diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index 68514b5ff96..8c8051b6f5f 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -119,7 +119,9 @@ return m_styles["tail"] = "None" - update_body() + update_tail_layer() + update_wing_layer() + update_spines_layer() return TRUE /mob/living/carbon/human/proc/change_alt_head(alternate_head) diff --git a/code/modules/mob/living/silicon/silicon_mob.dm b/code/modules/mob/living/silicon/silicon_mob.dm index 53e0d5e13b3..96dc8167b84 100644 --- a/code/modules/mob/living/silicon/silicon_mob.dm +++ b/code/modules/mob/living/silicon/silicon_mob.dm @@ -5,6 +5,7 @@ weather_immunities = list("ash") mob_biotypes = MOB_ROBOTIC flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + initial_traits = list(TRAIT_RESISTHEAT) // You can define armor as a list in datum definition (e.g. `armor = list("fire" = 80, "brute" = 10)`), // which would be converted to armor datum during initialization. diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index c9e484c82f7..410d8d20375 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -156,6 +156,8 @@ if(ishuman(copymob)) //Suit checks are in check_mob var/mob/living/carbon/human/H = copymob temp_img = icon('icons/obj/butts.dmi', H.dna.species.butt_sprite) + else if(isrobot(copymob)) + temp_img = icon('icons/obj/butts.dmi', "machine") else if(isdrone(copymob)) temp_img = icon('icons/obj/butts.dmi', "drone") else if(isnymph(copymob)) diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index 63d10ed7279..b383bc3e54a 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -47,13 +47,19 @@ taste_description = "slimes" taste_mult = 1.3 +/datum/reagent/slimejelly/reaction_mob(mob/living/M, method, volume, show_message) + var/mob/living/carbon/C = M + if(method != REAGENT_INGEST || !iscarbon(C) || !C.mind?.has_antag_datum(/datum/antagonist/vampire)) + return ..() + + M.set_nutrition(min(NUTRITION_LEVEL_WELL_FED, M.nutrition + 10)) + M.blood_volume = min(M.blood_volume + round(volume, 0.1), BLOOD_VOLUME_NORMAL) + M.absorb_blood(id) + /datum/reagent/slimejelly/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE var/mob/living/carbon/C = M if(iscarbon(C) && C.mind?.has_antag_datum(/datum/antagonist/vampire)) - M.set_nutrition(min(NUTRITION_LEVEL_WELL_FED, M.nutrition + 10)) - if(M.get_blood_id() != id) - M.blood_volume = min(M.blood_volume + REAGENTS_METABOLISM, BLOOD_VOLUME_NORMAL) return ..() | update_flags if(M.get_blood_id() != id) diff --git a/code/modules/smithing/components/knife_components.dm b/code/modules/smithing/components/knife_components.dm index db618d0f5a2..f56320488df 100644 --- a/code/modules/smithing/components/knife_components.dm +++ b/code/modules/smithing/components/knife_components.dm @@ -37,13 +37,13 @@ finished_product = /obj/item/kitchen/knife/smithed/utility /obj/item/smithed_item/component/knife_handle/throwing - name = "throwing knife blade" + name = "throwing knife handle" desc = "Lightweight smithed component part of a knife. There is a small ring on the end of the handle." materials = list(MAT_METAL = 3000, MAT_TITANIUM = 3000) finished_product = /obj/item/kitchen/knife/smithed/thrown /obj/item/smithed_item/component/knife_handle/combat - name = "combat knife blade" + name = "combat knife handle" desc = "Heavyweight smithed component part of a knife. The handle is thick and rugged." materials = list(MAT_TITANIUM = 3000, MAT_PLASMA = 3000) finished_product = /obj/item/kitchen/knife/smithed/combat diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm index 47afa15fe8b..56e4f87087b 100644 --- a/code/modules/surgery/organs/blood.dm +++ b/code/modules/surgery/organs/blood.dm @@ -365,11 +365,13 @@ O.off_floor = TRUE O.layer = BELOW_MOB_LAYER -/mob/living/proc/absorb_blood() +/mob/living/proc/absorb_blood(passed_id) // This merely deletes the blood reagent inside of the mob to look nice on health scans. // The update to .blood_volume happens in `/datum/reagent/proc/reaction_mob` var/id = get_blood_id() + if(passed_id) + id = passed_id if(id) - reagents.del_reagent(get_blood_id()) + reagents.del_reagent(id) #undef EXOTIC_BLEED_MULTIPLIER diff --git a/icons/_nanomaps/DeltaStation_nanomap_z1.png b/icons/_nanomaps/DeltaStation_nanomap_z1.png index 0e72f25f9b4..07355be5b19 100644 Binary files a/icons/_nanomaps/DeltaStation_nanomap_z1.png and b/icons/_nanomaps/DeltaStation_nanomap_z1.png differ diff --git a/icons/_nanomaps/EmeraldStation_nanomap_z1.png b/icons/_nanomaps/EmeraldStation_nanomap_z1.png index 2079fa12b59..738ae066d80 100644 Binary files a/icons/_nanomaps/EmeraldStation_nanomap_z1.png and b/icons/_nanomaps/EmeraldStation_nanomap_z1.png differ diff --git a/icons/_nanomaps/MetaStation_nanomap_z1.png b/icons/_nanomaps/MetaStation_nanomap_z1.png index d987019bb46..1c00052d18d 100644 Binary files a/icons/_nanomaps/MetaStation_nanomap_z1.png and b/icons/_nanomaps/MetaStation_nanomap_z1.png differ