From b62ef0f4e81b62bd029267d4fa7f7653866a2ef1 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 2 Jun 2020 19:44:47 -0400 Subject: [PATCH 01/25] right... --- _maps/shuttles/emergency_arena.dmm | 26 +++-- .../structures/lavaland/necropolis_tendril.dm | 5 +- .../mining/lavaland/necropolis_chests.dm | 107 ++++++++++-------- .../hostile/mining_mobs/elites/elite.dm | 13 ++- .../mining_mobs/elites/goliath_broodmother.dm | 1 + .../hostile/mining_mobs/elites/herald.dm | 2 +- .../hostile/mining_mobs/elites/legionnaire.dm | 2 +- .../hostile/mining_mobs/elites/pandora.dm | 4 +- 8 files changed, 91 insertions(+), 69 deletions(-) diff --git a/_maps/shuttles/emergency_arena.dmm b/_maps/shuttles/emergency_arena.dmm index 1314b8a732..2ba9206830 100644 --- a/_maps/shuttles/emergency_arena.dmm +++ b/_maps/shuttles/emergency_arena.dmm @@ -43,7 +43,7 @@ }, /area/shuttle/escape/arena) "l" = ( -/obj/structure/closet/crate/necropolis/tendril, +/obj/structure/closet/crate/necropolis/tendril/magic, /turf/open/indestructible/necropolis/air, /area/shuttle/escape/arena) "m" = ( @@ -65,10 +65,18 @@ /obj/structure/healingfountain, /turf/open/indestructible/necropolis/air, /area/shuttle/escape/arena) +"t" = ( +/obj/structure/closet/crate/necropolis/tendril/misc, +/turf/open/indestructible/necropolis/air, +/area/shuttle/escape/arena) "z" = ( /obj/effect/landmark/shuttle_arena_safe, /turf/open/indestructible/necropolis/air, /area/shuttle/escape/arena) +"H" = ( +/obj/structure/closet/crate/necropolis/tendril/weapon_armor, +/turf/open/indestructible/necropolis/air, +/area/shuttle/escape/arena) (1,1,1) = {" a @@ -264,16 +272,16 @@ m l j m -l +H j k -l +H j m -l +t j m -j +t j p g @@ -524,16 +532,16 @@ m l j m -l +H j m -l +H j m -l +t j m -j +t j p g diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index 2911babd83..425483d8e6 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -10,6 +10,7 @@ max_mobs = 3 max_integrity = 250 mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril) + var/loot_type = /obj/structure/closet/crate/necropolis/tendril/magic move_resist=INFINITY // just killing it tears a massive hole in the ground, let's not move it anchored = TRUE @@ -21,9 +22,11 @@ /obj/structure/spawner/lavaland/goliath mob_types = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril) + loot_type = /obj/structure/closet/crate/necropolis/tendril/weapon_armor /obj/structure/spawner/lavaland/legion mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril) + loot_type = /obj/structure/closet/crate/necropolis/tendril/misc /obj/structure/spawner/lavaland/icewatcher mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing) @@ -41,7 +44,7 @@ GLOBAL_LIST_INIT(tendrils, list()) /obj/structure/spawner/lavaland/deconstruct(disassembled) new /obj/effect/collapse(loc) - new /obj/structure/closet/crate/necropolis/tendril(loc) + new loot_type(loc) return ..() diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 53ce676317..2f5b9dd185 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -10,73 +10,81 @@ /obj/structure/closet/crate/necropolis/tendril desc = "It's watching you suspiciously." -/obj/structure/closet/crate/necropolis/tendril/PopulateContents() - var/loot = rand(1,28) +/obj/structure/closet/crate/necropolis/tendril/magic + name = "relic necropolis chest" + +/obj/structure/closet/crate/necropolis/tendril/weapon_armor + name = "armament necropolis chest" + +/obj/structure/closet/crate/necropolis/tendril/misc + +/obj/structure/closet/crate/necropolis/tendril/magic/PopulateContents() + var/loot = rand(1,8) switch(loot) if(1) - new /obj/item/shared_storage/red(src) - if(2) - new /obj/item/clothing/suit/space/hardsuit/cult(src) - if(3) new /obj/item/soulstone/anybody(src) + if(2) + new /obj/item/rod_of_asclepius(src) + if(3) + new /obj/item/organ/heart/cursed/wizard(src) if(4) - new /obj/item/katana/cursed(src) + new /obj/item/book/granter/spell/summonitem(src) if(5) - new /obj/item/clothing/glasses/godeye(src) + new /obj/item/borg/upgrade/modkit/lifesteal(src) + new /obj/item/bedsheet/cult(src) if(6) - new /obj/item/reagent_containers/glass/bottle/potion/flight(src) + new /obj/item/clothing/neck/necklace/memento_mori(src) if(7) - new /obj/item/pickaxe/diamond(src) + new /obj/item/warp_cube/red(src) if(8) + new /obj/item/immortality_talisman(src) + +/obj/structure/closet/crate/necropolis/tendril/weapon_armor/PopulateContents() + var/loot = rand(1,8) + switch(loot) + if(1) + new /obj/item/clothing/suit/space/hardsuit/cult(src) + if(2) + new /obj/item/katana/cursed(src) + if(3) if(prob(50)) new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) else new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) - if(9) - new /obj/item/rod_of_asclepius(src) - if(10) - new /obj/item/organ/heart/cursed/wizard(src) - if(11) - new /obj/item/ship_in_a_bottle(src) - if(12) + if(4) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old(src) - if(13) - new /obj/item/jacobs_ladder(src) - if(14) + if(5) new /obj/item/nullrod/scythe/talking(src) - if(15) + if(6) new /obj/item/nullrod/armblade(src) - if(16) - new /obj/item/guardiancreator(src) - if(17) + if(7) + new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) + new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) + if(8) + new /obj/item/grenade/clusterbuster/inferno(src) + +/obj/structure/closet/crate/necropolis/tendril/misc/PopulateContents() + var/loot = rand(1,8) + switch(loot) + if(1) + new /obj/item/shared_storage/red(src) + if(2) + new /obj/item/reagent_containers/glass/bottle/potion/flight(src) + if(3) + new /obj/item/ship_in_a_bottle(src) + if(4) + new /obj/item/voodoo(src) + if(5) + new /obj/item/book_of_babel(src) + if(6) + new /obj/item/jacobs_ladder(src) + if(7) if(prob(50)) new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) else new /obj/item/disk/design_disk/modkit_disc/bounty(src) - if(18) - new /obj/item/warp_cube/red(src) - if(19) + if(8) new /obj/item/wisp_lantern(src) - if(20) - new /obj/item/immortality_talisman(src) - if(21) - new /obj/item/gun/magic/hook(src) - if(22) - new /obj/item/voodoo(src) - if(23) - new /obj/item/grenade/clusterbuster/inferno(src) - if(24) - new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) - new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) - if(25) - new /obj/item/book/granter/spell/summonitem(src) - if(26) - new /obj/item/book_of_babel(src) - if(27) - new /obj/item/borg/upgrade/modkit/lifesteal(src) - new /obj/item/bedsheet/cult(src) - if(28) - new /obj/item/clothing/neck/necklace/memento_mori(src) //KA modkit design discs /obj/item/disk/design_disk/modkit_disc @@ -741,7 +749,7 @@ new /obj/item/lava_staff(src) if(3) new /obj/item/book/granter/spell/sacredflame(src) - new /obj/item/gun/magic/wand/fireball(src) + new /obj/item/gun/magic/hook(src) if(4) new /obj/item/dragons_blood(src) @@ -977,7 +985,7 @@ if(2) new /obj/item/gun/ballistic/revolver/doublebarrel/super(src) if(3) - new /obj/item/gun/magic/staff/spellblade(src) + new /obj/item/guardiancreator(src) /obj/structure/closet/crate/necropolis/bubblegum/crusher name = "bloody bubblegum chest" @@ -1066,6 +1074,7 @@ var/random_crystal = pick(choices) new random_crystal(src) new /obj/item/organ/vocal_cords/colossus(src) + new /obj/item/clothing/glasses/godeye(src) /obj/structure/closet/crate/necropolis/colossus/crusher name = "angelic colossus chest" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 81b541dc7b..c41a31c76e 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -26,6 +26,7 @@ var/list/attack_action_types = list() var/can_talk = FALSE var/obj/loot_drop = null + var/crate_type = /obj/structure/closet/crate/necropolis/tendril var/owner //Gives player-controlled variants the ability to swap attacks @@ -183,7 +184,7 @@ While using this makes the system rely on OnFire, it still gives options for tim activator = null -obj/structure/elite_tumor/proc/spawn_elite(var/mob/dead/observer/elitemind) +/obj/structure/elite_tumor/proc/spawn_elite(var/mob/dead/observer/elitemind) var/selectedspawn = pick(potentialspawns) mychild = new selectedspawn(loc) visible_message("[mychild] emerges from [src]!") @@ -194,7 +195,7 @@ obj/structure/elite_tumor/proc/spawn_elite(var/mob/dead/observer/elitemind) icon_state = "tumor_popped" INVOKE_ASYNC(src, .proc/arena_checks) -obj/structure/elite_tumor/proc/return_elite() +/obj/structure/elite_tumor/proc/return_elite() mychild.forceMove(loc) visible_message("[mychild] emerges from [src]!") playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE) @@ -272,7 +273,7 @@ obj/structure/elite_tumor/proc/return_elite() visible_message("[mychild] suddenly reappears above [src]!") playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE) -obj/structure/elite_tumor/proc/onEliteLoss() +/obj/structure/elite_tumor/proc/onEliteLoss() playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, TRUE, TRUE) visible_message("[src] begins to convulse violently before beginning to dissipate.") visible_message("As [src] closes, something is forced up from down below.") @@ -284,14 +285,14 @@ obj/structure/elite_tumor/proc/onEliteLoss() return var/lootpick = rand(1, 2) if(lootpick == 1 && mychild.loot_drop != null) - new mychild.loot_drop(lootbox) + new mychild.crate_type(loc) else - new /obj/item/tumor_shard(lootbox) + new mychild.crate_type(lootbox) mychild = null activator = null qdel(src) -obj/structure/elite_tumor/proc/onEliteWon() +/obj/structure/elite_tumor/proc/onEliteWon() activity = TUMOR_PASSIVE activator = null mychild.revive(full_heal = TRUE, admin_revive = TRUE) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index e662f4e525..99f8ccb645 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm @@ -41,6 +41,7 @@ mouse_opacity = MOUSE_OPACITY_ICON deathmessage = "explodes into gore!" loot_drop = /obj/item/crusher_trophy/broodmother_tongue + crate_type = /obj/structure/closet/crate/necropolis/tendril/weapon_armor attack_action_types = list(/datum/action/innate/elite_attack/tentacle_patch, /datum/action/innate/elite_attack/spawn_children, diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm index 78b24acfb0..e03463caa4 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -39,7 +39,7 @@ deathsound = 'sound/magic/demon_dies.ogg' deathmessage = "begins to shudder as it becomes transparent..." loot_drop = /obj/item/clothing/neck/cloak/herald_cloak - + crate_type = /obj/structure/closet/crate/necropolis/tendril/magic can_talk = 1 attack_action_types = list(/datum/action/innate/elite_attack/herald_trishot, diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm index 31f925fb2b..5c0e7d15a0 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm @@ -39,7 +39,7 @@ deathsound = 'sound/magic/curse.ogg' deathmessage = "'s arms reach out before it falls apart onto the floor, lifeless." loot_drop = /obj/item/crusher_trophy/legionnaire_spine - + crate_type = /obj/structure/closet/crate/necropolis/tendril/misc attack_action_types = list(/datum/action/innate/elite_attack/legionnaire_charge, /datum/action/innate/elite_attack/head_detach, /datum/action/innate/elite_attack/bonfire_teleport, diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm index ebbf032859..cec5f28a2a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm @@ -39,7 +39,7 @@ deathsound = 'sound/magic/repulse.ogg' deathmessage = "'s lights flicker, before its top part falls down." loot_drop = /obj/item/clothing/accessory/pandora_hope - + crate_type = /obj/structure/closet/crate/necropolis/tendril/magic attack_action_types = list(/datum/action/innate/elite_attack/singular_shot, /datum/action/innate/elite_attack/magic_box, /datum/action/innate/elite_attack/pandora_teleport, @@ -190,4 +190,4 @@ /obj/item/clothing/accessory/pandora_hope/on_uniform_dropped(obj/item/clothing/under/U, user) var/mob/living/L = user if(L && L.mind) - SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "hope_lavaland") + SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "hope_lavaland") \ No newline at end of file From 937731d77d0ad8a89b3d69b7b433c9e7cecf9543 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 2 Jun 2020 21:32:36 -0400 Subject: [PATCH 02/25] fix and tested --- .../simple_animal/hostile/mining_mobs/elites/elite.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index c41a31c76e..52eda34461 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -277,7 +277,7 @@ While using this makes the system rely on OnFire, it still gives options for tim playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, TRUE, TRUE) visible_message("[src] begins to convulse violently before beginning to dissipate.") visible_message("As [src] closes, something is forced up from down below.") - var/obj/structure/closet/crate/necropolis/tendril/lootbox = new /obj/structure/closet/crate/necropolis/tendril(loc) + var/obj/structure/closet/crate/necropolis/tendril/lootbox = new mychild.crate_type(loc) if(!boosted) mychild = null activator = null @@ -285,9 +285,9 @@ While using this makes the system rely on OnFire, it still gives options for tim return var/lootpick = rand(1, 2) if(lootpick == 1 && mychild.loot_drop != null) - new mychild.crate_type(loc) + new mychild.loot_drop(lootbox) else - new mychild.crate_type(lootbox) + new /obj/item/tumor_shard(lootbox) mychild = null activator = null qdel(src) From 8b406df1ec363979c575779afcd348095cfb4d0b Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 5 Jun 2020 22:43:49 -0400 Subject: [PATCH 03/25] mk III --- code/game/objects/items/weaponry.dm | 5 ++ code/modules/library/lib_items.dm | 4 +- code/modules/mining/equipment/mining_tools.dm | 10 +++ .../mining/lavaland/necropolis_chests.dm | 26 +++++- .../projectiles/ammunition/special/magic.dm | 14 +++ .../projectiles/guns/magic/spell_book.dm | 84 ++++++++++++++++++ code/modules/projectiles/guns/magic/wand.dm | 3 +- .../projectiles/projectile/magic/spellcard.dm | 57 ++++++++++++ .../chemistry/reagents/other_reagents.dm | 52 +++++++++++ .../reagents/reagent_containers/bottle.dm | 18 +++- icons/obj/library.dmi | Bin 28152 -> 37786 bytes icons/obj/mining.dmi | Bin 63805 -> 65648 bytes tgstation.dme | 1 + 13 files changed, 266 insertions(+), 8 deletions(-) create mode 100644 code/modules/projectiles/guns/magic/spell_book.dm diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 1bb4579176..671d01f130 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -235,6 +235,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 resistance_flags = FIRE_PROOF total_mass = TOTAL_MASS_MEDIEVAL_WEAPON +/obj/item/katana/lavaland + desc = "Woefully underpowered in Lavaland." + block_chance = 30 + force = 25 //Like a fireaxe but one handed and can block! + /obj/item/katana/cursed slot_flags = null diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 89fa3ac6cf..ed9fc6d67f 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -22,7 +22,7 @@ max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) var/state = 0 - var/list/allowed_books = list(/obj/item/book, /obj/item/spellbook, /obj/item/storage/book) //Things allowed in the bookcase + var/list/allowed_books = list(/obj/item/book, /obj/item/spellbook, /obj/item/storage/book, /obj/item/gun/magic/wand/book) //Things allowed in the bookcase /obj/structure/bookcase/examine(mob/user) . = ..() @@ -192,7 +192,7 @@ desc = "Crack it open, inhale the musk of its pages, and learn something new." throw_speed = 1 throw_range = 5 - w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) + w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) attack_verb = list("bashed", "whacked", "educated") resistance_flags = FLAMMABLE var/dat //Actual page content diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 50a3dec9dd..4cdf1d35d6 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -66,6 +66,16 @@ force = 19 custom_materials = list(/datum/material/diamond=4000) +/obj/item/pickaxe/rosegold + name = "rose gold pickaxe" + icon_state = "rgpickaxe" + item_state = "rgpickaxe" + toolspeed = 0.1 + desc = "A pickaxe with a light rose gold head and some red glowing ruins. Extremely robust at cracking rock walls and digging up dirt." + force = 19 + custom_materials = list(/datum/material/gold=4000) + digrange = 3 + /obj/item/pickaxe/plasteel name = "plasteel-tipped pickaxe" icon_state = "titaxe" diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 2f5b9dd185..1dedb0042d 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -19,7 +19,7 @@ /obj/structure/closet/crate/necropolis/tendril/misc /obj/structure/closet/crate/necropolis/tendril/magic/PopulateContents() - var/loot = rand(1,8) + var/loot = rand(1,10) switch(loot) if(1) new /obj/item/soulstone/anybody(src) @@ -38,14 +38,20 @@ new /obj/item/warp_cube/red(src) if(8) new /obj/item/immortality_talisman(src) + if(9) + new /obj/item/gun/magic/wand/book/healing(src) + if(10) + new /obj/item/reagent_containers/glass/bottle/ichor/red(src) + new /obj/item/reagent_containers/glass/bottle/ichor/blue(src) + new /obj/item/reagent_containers/glass/bottle/ichor/green(src) /obj/structure/closet/crate/necropolis/tendril/weapon_armor/PopulateContents() - var/loot = rand(1,8) + var/loot = rand(1,11) switch(loot) if(1) new /obj/item/clothing/suit/space/hardsuit/cult(src) if(2) - new /obj/item/katana/cursed(src) + new /obj/item/katana/lavaland(src) if(3) if(prob(50)) new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) @@ -62,9 +68,15 @@ new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) if(8) new /obj/item/grenade/clusterbuster/inferno(src) + if(9) + new /obj/item/gun/magic/wand/book/shock(src) + if(10) + new /obj/item/gun/magic/wand/book/page(src) + if(11) + new /obj/item/gun/magic/wand/book/spark(src) /obj/structure/closet/crate/necropolis/tendril/misc/PopulateContents() - var/loot = rand(1,8) + var/loot = rand(1,10) switch(loot) if(1) new /obj/item/shared_storage/red(src) @@ -85,6 +97,12 @@ new /obj/item/disk/design_disk/modkit_disc/bounty(src) if(8) new /obj/item/wisp_lantern(src) + if(9) + new /obj/item/pickaxe/rosegold(src) + if(10) + new /obj/item/bedsheet/cosmos(src) + new /obj/item/melee/skateboard/hoverboard(src) + //KA modkit design discs /obj/item/disk/design_disk/modkit_disc diff --git a/code/modules/projectiles/ammunition/special/magic.dm b/code/modules/projectiles/ammunition/special/magic.dm index cc039c5f2b..bea51efc24 100644 --- a/code/modules/projectiles/ammunition/special/magic.dm +++ b/code/modules/projectiles/ammunition/special/magic.dm @@ -43,3 +43,17 @@ /obj/item/ammo_casing/magic/locker projectile_type = /obj/item/projectile/magic/locker + +//Spell book ammo casing +/obj/item/ammo_casing/magic/book/book + projectile_type = /obj/item/projectile/magic/spellcard/book + +/obj/item/ammo_casing/magic/book/spark + projectile_type = /obj/item/projectile/magic/spellcard/book/spark + +/obj/item/ammo_casing/magic/book/heal + projectile_type = /obj/item/projectile/magic/spellcard/book/heal + harmful = FALSE + +/obj/item/ammo_casing/magic/book/shock + projectile_type = /obj/item/projectile/magic/spellcard/book/shock diff --git a/code/modules/projectiles/guns/magic/spell_book.dm b/code/modules/projectiles/guns/magic/spell_book.dm new file mode 100644 index 0000000000..1577b7b024 --- /dev/null +++ b/code/modules/projectiles/guns/magic/spell_book.dm @@ -0,0 +1,84 @@ +/obj/item/gun/magic/wand/book + name = "blank spellbook" + desc = "It's not just a book, it's a SPELL book!" + ammo_type = /obj/item/ammo_casing/magic + icon = 'icons/obj/library.dmi' + icon_state = "book" + w_class = WEIGHT_CLASS_NORMAL + charges = 10 //We start with max pages + max_charges = 10 + variable_charges = FALSE + self_attack = FALSE + +/obj/item/gun/magic/wand/book/examine(mob/user) + . = ..() + . += "Has [charges] pages\s remaining." + +/obj/item/gun/magic/wand/book/attack(atom/target, mob/living/user) + if(target == user) + return + ..() + +/obj/item/gun/magic/wand/book/afterattack(atom/target, mob/living/user) + if(charges == 0) + shoot_with_empty_chamber(user) + return + if(target == user) + to_chat(user, "The book has [charges] pages\s remaining.") + else + . = ..() + update_icon() + +/obj/item/gun/magic/wand/book/attackby(obj/item/S, mob/living/user, params) + if(!istype(S, /obj/item/paper)) + return + if(charges < max_charges) + charges++ + recharge_newshot() + to_chat(user, "You add a new page to [src].") + qdel(S) + update_icon() + process() + else + to_chat(user, "The [src] has no more room for pages!") + return + +////////////////////// +//Spell Book - SPARK// +////////////////////// + +/obj/item/gun/magic/wand/book/spark + name = "Spell Book of Spark" + desc = "A spell book that fires burn pages to set the target ablaze!" + ammo_type = /obj/item/ammo_casing/magic/book/spark + icon_state = "spellbook_spark" + +////////////////////// +//Spell Book - PAGE/// +////////////////////// + +/obj/item/gun/magic/wand/book/page + name = "Spell Book of Throw" + desc = "A spell book that throws pages at its target!" + ammo_type = /obj/item/ammo_casing/magic/book/book + icon_state = "spellbook_page" + +////////////////////// +//Spell Book - SHOCK// +////////////////////// + +/obj/item/gun/magic/wand/book/shock + name = "Spell Book of Shock" + desc = "A spell book that uses its pages to capture energy in the air and send it in a bolt at its target!" + ammo_type = /obj/item/ammo_casing/magic/book/shock + icon_state = "spellbook_shock" + +//////////////////////// +//Spell Book - HEALING// +//////////////////////// + +/obj/item/gun/magic/wand/book/healing + name = "Spell Book of Mending" + desc = "A spell book that uses its pages to heal and repair the target! The back of the book lists what it works on, and it seems to only be of flesh and of metal beings..." + ammo_type = /obj/item/ammo_casing/magic/book/heal + icon_state = "spellbook_healing" diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index f48020aeb5..8703b8325c 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -8,6 +8,7 @@ can_charge = 0 max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths) var/variable_charges = 1 + var/self_attack = TRUE /obj/item/gun/magic/wand/Initialize() if(prob(75) && variable_charges) //25% chance of listed max charges, 50% chance of 1/2 max charges, 25% chance of 1/3 max charges @@ -33,7 +34,7 @@ if(!charges) shoot_with_empty_chamber(user) return - if(target == user) + if(target == user && self_attack == TRUE) if(no_den_usage) var/area/A = get_area(user) if(istype(A, /area/wizard_station)) diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm index 1b8f326573..7acf52d878 100644 --- a/code/modules/projectiles/projectile/magic/spellcard.dm +++ b/code/modules/projectiles/projectile/magic/spellcard.dm @@ -4,3 +4,60 @@ icon_state = "spellcard" damage_type = BURN damage = 2 + +/obj/item/projectile/magic/spellcard/book + nodamage = FALSE + name = "enchanted page" + desc = "A piece of paper enchanted to give it extreme durability and stiffness, along with a very hot burn to anyone unfortunate enough to get hit by a charged one." + icon_state = "spellcard" + damage_type = BURN + damage = 12 + flag = "magic" + +/obj/item/projectile/magic/spellcard/book/spark + damage = 4 + var/fire_stacks = 4 + +/obj/item/projectile/magic/spellcard/book/spark/on_hit(atom/target, blocked = FALSE) + . = ..() + var/mob/living/carbon/M = target + if(iscarbon(target)) + if(M.anti_magic_check()) + M.visible_message("[src] vanishes on contact with [target]!") + return BULLET_ACT_BLOCK + else + M.adjust_fire_stacks(fire_stacks) + M.IgniteMob() + return + else + damage = 20 //If we are a simplemob we deal 5x damage + +/obj/item/projectile/magic/spellcard/book/shock + damage = 0 + stamina = 11 + stutter = 5 + jitter = 20 + knockdown = 10 + +/obj/item/projectile/magic/spellcard/book/heal + damage = 0 + +/obj/item/projectile/magic/spellcard/book/heal/on_hit(atom/target, blocked = FALSE) + . = ..() + var/mob/living/carbon/M = target + if(iscarbon(target)) + if(M.anti_magic_check()) + M.visible_message("[src] vanishes on contact with [target]!") + return BULLET_ACT_BLOCK + else + M.visible_message("[src] mends [target]!") + M.adjustBruteLoss(-5) //HEALS + M.adjustOxyLoss(-5) + M.adjustBruteLoss(-5) + M.adjustFireLoss(-5) + M.adjustToxLoss(-5, TRUE) //heals TOXINLOVERs + M.adjustCloneLoss(-5) + M.adjustStaminaLoss(-5) + return + else + return diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index d3ac8fa506..5e55bbaeb6 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2195,6 +2195,58 @@ color = "#f7685e" metabolization_rate = REAGENTS_METABOLISM * 0.25 +/datum/reagent/red_ichor + name = "Red Ichor" + can_synth = FALSE + description = "A unknown red liquid, linked to healing of most moral wounds." + color = "#c10000" + metabolization_rate = REAGENTS_METABOLISM * 2.5 + +/datum/reagent/red_ichor/on_mob_life(mob/living/carbon/M) + M.adjustBruteLoss(-50) + M.adjustOxyLoss(-50) + M.adjustBruteLoss(-50) + M.adjustFireLoss(-50) + M.adjustToxLoss(-50, TRUE) //heals TOXINLOVERs + M.adjustCloneLoss(-50) + M.adjustStaminaLoss(-50) + ..() + +/datum/reagent/green_ichor + name = "Green Ichor" + can_synth = FALSE + description = "A unknown green liquid, linked to healing of most internal wounds." + color = "#158c00" + metabolization_rate = REAGENTS_METABOLISM * 2.5 + +/datum/reagent/green_ichor/on_mob_life(mob/living/carbon/M) + M.adjustOrganLoss(ORGAN_SLOT_LUNGS, -100) + M.adjustOrganLoss(ORGAN_SLOT_HEART, -100) + M.adjustOrganLoss(ORGAN_SLOT_LIVER, -100) + M.adjustOrganLoss(ORGAN_SLOT_EARS, -100) + M.adjustOrganLoss(ORGAN_SLOT_STOMACH, -100) + M.adjustOrganLoss(ORGAN_SLOT_TONGUE, -100) + M.adjustOrganLoss(ORGAN_SLOT_EYES, -100) + ..() + +/datum/reagent/blue_ichor + name = "Blue Ichor" + can_synth = FALSE + description = "A unknown blue liquid, linked to healing the mind." + color = "#0914e0" + metabolization_rate = REAGENTS_METABOLISM * 2.5 + +/datum/reagent/blue_ichor/on_mob_life(mob/living/carbon/M) + M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -100) + M.cure_all_traumas(TRAUMA_RESILIENCE_MAGIC) + M.hallucination = 0 + M.dizziness = 0 + M.disgust = 0 + M.drowsyness = 0 + M.stuttering = 0 + M.confused = 0 + M.SetSleeping(0, 0) + ..() //body bluids /datum/reagent/consumable/semen diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index cc1cd21bac..84100bea8c 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -8,7 +8,6 @@ possible_transfer_amounts = list(5,10,15,25,30) volume = 30 - /obj/item/reagent_containers/glass/bottle/Initialize() . = ..() if(!icon_state) @@ -412,6 +411,23 @@ name = "bromine bottle" list_reagents = list(/datum/reagent/bromine = 30) +//Ichors +/obj/item/reagent_containers/glass/bottle/ichor + possible_transfer_amounts = list(1) + volume = 1 + +/obj/item/reagent_containers/glass/bottle/ichor/red + name = "healing potion" + list_reagents = list(/datum/reagent/red_ichor = 1) + +/obj/item/reagent_containers/glass/bottle/ichor/blue + name = "blue potion" + list_reagents = list(/datum/reagent/blue_ichor = 1) + +/obj/item/reagent_containers/glass/bottle/ichor/green + name = "green potion" + list_reagents = list(/datum/reagent/green_ichor = 1) + //Lewd Stuff /obj/item/reagent_containers/glass/bottle/crocin diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 727d69b1e3b12fdbee156c81f1280aa801fa03f1..6e14c4c6ca58f355d18a8093a9bdc339cd5edaa6 100644 GIT binary patch literal 37786 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 F0ssJrjrRZm literal 28152 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%0AG2?+_tKW;K4Z0zj73rLl{*3`TP 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 diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 43bc9c48aa08940cc155c920a5a3d965daa94b30..f31844782d558ec5166e05abb7773de984473433 100644 GIT binary patch delta 45309 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 S3YxqCKpWa~w_4Ty#s2^cWIi7N delta 43430 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 A@c;k- diff --git a/tgstation.dme b/tgstation.dme index b7f998e7e4..9603b56b9a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2868,6 +2868,7 @@ #include "code\modules\projectiles\guns\energy\pulse.dm" #include "code\modules\projectiles\guns\energy\special.dm" #include "code\modules\projectiles\guns\energy\stun.dm" +#include "code\modules\projectiles\guns\magic\spell_book.dm" #include "code\modules\projectiles\guns\magic\staff.dm" #include "code\modules\projectiles\guns\magic\wand.dm" #include "code\modules\projectiles\guns\misc\beam_rifle.dm" From 51189d7a04044c5665fc6442b0691be25a63d5de Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 9 Jun 2020 08:00:01 -0400 Subject: [PATCH 04/25] of copper and gold --- code/modules/mining/equipment/mining_tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 4cdf1d35d6..0549562f85 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -71,7 +71,7 @@ icon_state = "rgpickaxe" item_state = "rgpickaxe" toolspeed = 0.1 - desc = "A pickaxe with a light rose gold head and some red glowing ruins. Extremely robust at cracking rock walls and digging up dirt." + desc = "A pickaxe with a light rose gold head and some red glowing runes. Extremely robust at cracking rock walls and digging up dirt." force = 19 custom_materials = list(/datum/material/gold=4000) digrange = 3 From 4d9eeae268d07ccf2079e3a2f01773151ca392e5 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 17 Jun 2020 03:08:52 -0400 Subject: [PATCH 05/25] Update necropolis_chests.dm --- code/modules/mining/lavaland/necropolis_chests.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 7c7844aac5..146ff8ff02 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -103,7 +103,7 @@ new /obj/item/bedsheet/cosmos(src) new /obj/item/melee/skateboard/hoverboard(src) if(11) - if(prob(50)) + if(prob(50)) new /obj/item/malf_upgrade else new /obj/item/disk/tech_disk/illegal From 4e1817d2be443a05d7e0cf5ab451524b8f2c1cc2 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 17 Jun 2020 03:22:29 -0400 Subject: [PATCH 06/25] why were these tabs? --- code/modules/mining/lavaland/necropolis_chests.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 146ff8ff02..39ca4f746c 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -103,7 +103,7 @@ new /obj/item/bedsheet/cosmos(src) new /obj/item/melee/skateboard/hoverboard(src) if(11) - if(prob(50)) + if(prob(50)) new /obj/item/malf_upgrade else new /obj/item/disk/tech_disk/illegal From 49b0d38112699d550401c18687b3070bacb42d63 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Jul 2020 13:47:56 -0400 Subject: [PATCH 07/25] Apply suggestions from code review Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- .../modules/projectiles/ammunition/special/magic.dm | 2 +- code/modules/projectiles/guns/magic/spell_book.dm | 13 +++---------- .../projectiles/projectile/magic/spellcard.dm | 1 + 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/code/modules/projectiles/ammunition/special/magic.dm b/code/modules/projectiles/ammunition/special/magic.dm index bea51efc24..8380bf82e9 100644 --- a/code/modules/projectiles/ammunition/special/magic.dm +++ b/code/modules/projectiles/ammunition/special/magic.dm @@ -45,7 +45,7 @@ projectile_type = /obj/item/projectile/magic/locker //Spell book ammo casing -/obj/item/ammo_casing/magic/book/book +/obj/item/ammo_casing/magic/book projectile_type = /obj/item/projectile/magic/spellcard/book /obj/item/ammo_casing/magic/book/spark diff --git a/code/modules/projectiles/guns/magic/spell_book.dm b/code/modules/projectiles/guns/magic/spell_book.dm index 1577b7b024..fcdec185a2 100644 --- a/code/modules/projectiles/guns/magic/spell_book.dm +++ b/code/modules/projectiles/guns/magic/spell_book.dm @@ -19,19 +19,12 @@ return ..() -/obj/item/gun/magic/wand/book/afterattack(atom/target, mob/living/user) - if(charges == 0) - shoot_with_empty_chamber(user) - return - if(target == user) - to_chat(user, "The book has [charges] pages\s remaining.") - else - . = ..() - update_icon() +/obj/item/gun/magic/wand/book/zap_self(mob/living/user) + to_chat(user, "The book has [charges] pages\s remaining.") /obj/item/gun/magic/wand/book/attackby(obj/item/S, mob/living/user, params) if(!istype(S, /obj/item/paper)) - return + return ..() if(charges < max_charges) charges++ recharge_newshot() diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm index 7acf52d878..109d2c81ee 100644 --- a/code/modules/projectiles/projectile/magic/spellcard.dm +++ b/code/modules/projectiles/projectile/magic/spellcard.dm @@ -41,6 +41,7 @@ /obj/item/projectile/magic/spellcard/book/heal damage = 0 + nodamage = TRUE /obj/item/projectile/magic/spellcard/book/heal/on_hit(atom/target, blocked = FALSE) . = ..() From 8aceeb0c43333e1bca3b46df662410282a10179c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Jul 2020 13:50:42 -0400 Subject: [PATCH 08/25] Update spell_book.dm --- code/modules/projectiles/guns/magic/spell_book.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/magic/spell_book.dm b/code/modules/projectiles/guns/magic/spell_book.dm index fcdec185a2..87a2670cc4 100644 --- a/code/modules/projectiles/guns/magic/spell_book.dm +++ b/code/modules/projectiles/guns/magic/spell_book.dm @@ -8,17 +8,11 @@ charges = 10 //We start with max pages max_charges = 10 variable_charges = FALSE - self_attack = FALSE /obj/item/gun/magic/wand/book/examine(mob/user) . = ..() . += "Has [charges] pages\s remaining." -/obj/item/gun/magic/wand/book/attack(atom/target, mob/living/user) - if(target == user) - return - ..() - /obj/item/gun/magic/wand/book/zap_self(mob/living/user) to_chat(user, "The book has [charges] pages\s remaining.") @@ -53,7 +47,7 @@ /obj/item/gun/magic/wand/book/page name = "Spell Book of Throw" desc = "A spell book that throws pages at its target!" - ammo_type = /obj/item/ammo_casing/magic/book/book + ammo_type = /obj/item/ammo_casing/magic/book icon_state = "spellbook_page" ////////////////////// From dae3110100f7763947898690a31a25585062cb34 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Jul 2020 13:52:41 -0400 Subject: [PATCH 09/25] Update wand.dm --- code/modules/projectiles/guns/magic/wand.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index 8703b8325c..f48020aeb5 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -8,7 +8,6 @@ can_charge = 0 max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths) var/variable_charges = 1 - var/self_attack = TRUE /obj/item/gun/magic/wand/Initialize() if(prob(75) && variable_charges) //25% chance of listed max charges, 50% chance of 1/2 max charges, 25% chance of 1/3 max charges @@ -34,7 +33,7 @@ if(!charges) shoot_with_empty_chamber(user) return - if(target == user && self_attack == TRUE) + if(target == user) if(no_den_usage) var/area/A = get_area(user) if(istype(A, /area/wizard_station)) From f7dbce0cd08afe871247c09ef7bdc742af27e441 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Jul 2020 13:55:02 -0400 Subject: [PATCH 10/25] Update spellcard.dm --- .../projectiles/projectile/magic/spellcard.dm | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm index 109d2c81ee..1117db61fa 100644 --- a/code/modules/projectiles/projectile/magic/spellcard.dm +++ b/code/modules/projectiles/projectile/magic/spellcard.dm @@ -21,11 +21,10 @@ /obj/item/projectile/magic/spellcard/book/spark/on_hit(atom/target, blocked = FALSE) . = ..() var/mob/living/carbon/M = target + if(M.anti_magic_check()) + M.visible_message("[src] vanishes on contact with [target]!") + return BULLET_ACT_BLOCK if(iscarbon(target)) - if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [target]!") - return BULLET_ACT_BLOCK - else M.adjust_fire_stacks(fire_stacks) M.IgniteMob() return @@ -46,19 +45,18 @@ /obj/item/projectile/magic/spellcard/book/heal/on_hit(atom/target, blocked = FALSE) . = ..() var/mob/living/carbon/M = target + if(M.anti_magic_check()) + M.visible_message("[src] vanishes on contact with [target]!") + return BULLET_ACT_BLOCK if(iscarbon(target)) - if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [target]!") - return BULLET_ACT_BLOCK - else - M.visible_message("[src] mends [target]!") - M.adjustBruteLoss(-5) //HEALS - M.adjustOxyLoss(-5) - M.adjustBruteLoss(-5) - M.adjustFireLoss(-5) - M.adjustToxLoss(-5, TRUE) //heals TOXINLOVERs - M.adjustCloneLoss(-5) - M.adjustStaminaLoss(-5) + M.visible_message("[src] mends [target]!") + M.adjustBruteLoss(-5) //HEALS + M.adjustOxyLoss(-5) + M.adjustBruteLoss(-5) + M.adjustFireLoss(-5) + M.adjustToxLoss(-5, TRUE) //heals TOXINLOVERs + M.adjustCloneLoss(-5) + M.adjustStaminaLoss(-5) return else return From c21011c64cda9f9a48df6175c302bf58db22690f Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Jul 2020 14:09:31 -0400 Subject: [PATCH 11/25] Update spellcard.dm --- code/modules/projectiles/projectile/magic/spellcard.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm index 1117db61fa..e2f64e22d2 100644 --- a/code/modules/projectiles/projectile/magic/spellcard.dm +++ b/code/modules/projectiles/projectile/magic/spellcard.dm @@ -24,10 +24,11 @@ if(M.anti_magic_check()) M.visible_message("[src] vanishes on contact with [target]!") return BULLET_ACT_BLOCK + if(iscarbon(target)) - M.adjust_fire_stacks(fire_stacks) - M.IgniteMob() - return + M.adjust_fire_stacks(fire_stacks) + M.IgniteMob() + return else damage = 20 //If we are a simplemob we deal 5x damage From f479a8622e133e3941d41088c8ac5077abe801c8 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Jul 2020 14:11:46 -0400 Subject: [PATCH 12/25] Update spell_book.dm --- code/modules/projectiles/guns/magic/spell_book.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/projectiles/guns/magic/spell_book.dm b/code/modules/projectiles/guns/magic/spell_book.dm index 87a2670cc4..752a6ae5ac 100644 --- a/code/modules/projectiles/guns/magic/spell_book.dm +++ b/code/modules/projectiles/guns/magic/spell_book.dm @@ -9,10 +9,6 @@ max_charges = 10 variable_charges = FALSE -/obj/item/gun/magic/wand/book/examine(mob/user) - . = ..() - . += "Has [charges] pages\s remaining." - /obj/item/gun/magic/wand/book/zap_self(mob/living/user) to_chat(user, "The book has [charges] pages\s remaining.") @@ -28,7 +24,6 @@ process() else to_chat(user, "The [src] has no more room for pages!") - return ////////////////////// //Spell Book - SPARK// From ddeb564c80c2f3d61d28400ce65cd0c82129f70b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Jul 2020 14:21:16 -0400 Subject: [PATCH 13/25] Legion fix --- .../living/simple_animal/hostile/megafauna/legion.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 4da8a90b23..86d27fd1dd 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -139,8 +139,15 @@ Difficulty: Medium if(last_legion) loot = list(/obj/item/staff/storm) elimination = 0 - else if(prob(20)) - loot = list(/obj/structure/closet/crate/necropolis/tendril) + else if(prob(20)) //We role magic first + loot = list(/obj/structure/closet/crate/necropolis/tendril/magic) + return + else if(prob(20)) //We role weapons second + loot = list(/obj/structure/closet/crate/necropolis/tendril/weapon_armor) + return + else if(prob(20)) //We role misc third + loot = list(/obj/structure/closet/crate/necropolis/tendril/misc) + //if you dont role any, your unlucky ..() /obj/item/gps/internal/legion From 023dcc00191f3076133a21873b2097d6be19d210 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Jul 2020 14:22:41 -0400 Subject: [PATCH 14/25] Update spellcard.dm --- code/modules/projectiles/projectile/magic/spellcard.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm index e2f64e22d2..403d2513b9 100644 --- a/code/modules/projectiles/projectile/magic/spellcard.dm +++ b/code/modules/projectiles/projectile/magic/spellcard.dm @@ -58,6 +58,4 @@ M.adjustToxLoss(-5, TRUE) //heals TOXINLOVERs M.adjustCloneLoss(-5) M.adjustStaminaLoss(-5) - return - else return From b2dd2a105378b1a8c2ee96fc9063742b5c7043a9 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Jul 2020 14:28:40 -0400 Subject: [PATCH 15/25] Update necropolis_chests.dm --- code/modules/mining/lavaland/necropolis_chests.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 39ca4f746c..d1b58c2ebe 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -7,6 +7,20 @@ icon_state = "necrocrate" resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF +/obj/structure/closet/crate/necropolis/tendril/random + name = "necropolis crate" + desc = "A chest for a chest, a head for a head." + +/obj/structure/closet/crate/necropolis/tendril/random/PopulateContents() + var/loot = rand(1,3) + switch(loot) + if(1) + new /obj/structure/closet/crate/necropolis/tendril/magic(src) + if(2) + new /obj/structure/closet/crate/necropolis/tendril/weapon_armor(src) + if(3) + new /obj/structure/closet/crate/necropolis/tendril/misc(src) + /obj/structure/closet/crate/necropolis/tendril desc = "It's watching you suspiciously." From 062d514ac2b8d54d0b71538339d3267cac7f23b5 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Jul 2020 14:30:09 -0400 Subject: [PATCH 16/25] Update legion.dm --- .../living/simple_animal/hostile/megafauna/legion.dm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 86d27fd1dd..77b34fbca3 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -139,15 +139,8 @@ Difficulty: Medium if(last_legion) loot = list(/obj/item/staff/storm) elimination = 0 - else if(prob(20)) //We role magic first - loot = list(/obj/structure/closet/crate/necropolis/tendril/magic) - return - else if(prob(20)) //We role weapons second - loot = list(/obj/structure/closet/crate/necropolis/tendril/weapon_armor) - return - else if(prob(20)) //We role misc third - loot = list(/obj/structure/closet/crate/necropolis/tendril/misc) - //if you dont role any, your unlucky + else if(prob(20)) + loot = list(/obj/structure/closet/crate/necropolis/tendril/random) //This one spawns a chest that could be any of the three types ..() /obj/item/gps/internal/legion From c8fff2839524fedafae7d5940da9c3c9b836351c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 28 Jul 2020 00:12:00 -0400 Subject: [PATCH 17/25] Update spellcard.dm --- .../projectiles/projectile/magic/spellcard.dm | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm index 403d2513b9..5f9921bd62 100644 --- a/code/modules/projectiles/projectile/magic/spellcard.dm +++ b/code/modules/projectiles/projectile/magic/spellcard.dm @@ -21,16 +21,18 @@ /obj/item/projectile/magic/spellcard/book/spark/on_hit(atom/target, blocked = FALSE) . = ..() var/mob/living/carbon/M = target - if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [target]!") - return BULLET_ACT_BLOCK + if(ismob(target)) + var/mob/M = target + if(M.anti_magic_check()) + M.visible_message("[src] vanishes on contact with [target]!") + return BULLET_ACT_BLOCK - if(iscarbon(target)) - M.adjust_fire_stacks(fire_stacks) - M.IgniteMob() - return - else - damage = 20 //If we are a simplemob we deal 5x damage + if(iscarbon(target)) + M.adjust_fire_stacks(fire_stacks) + M.IgniteMob() + return + else + damage = 20 //If we are a simplemob we deal 5x damage /obj/item/projectile/magic/spellcard/book/shock damage = 0 @@ -46,16 +48,18 @@ /obj/item/projectile/magic/spellcard/book/heal/on_hit(atom/target, blocked = FALSE) . = ..() var/mob/living/carbon/M = target - if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [target]!") - return BULLET_ACT_BLOCK - if(iscarbon(target)) - M.visible_message("[src] mends [target]!") - M.adjustBruteLoss(-5) //HEALS - M.adjustOxyLoss(-5) - M.adjustBruteLoss(-5) - M.adjustFireLoss(-5) - M.adjustToxLoss(-5, TRUE) //heals TOXINLOVERs - M.adjustCloneLoss(-5) - M.adjustStaminaLoss(-5) - return + if(ismob(target)) + var/mob/M = target + if(M.anti_magic_check()) + M.visible_message("[src] vanishes on contact with [target]!") + return BULLET_ACT_BLOCK + if(iscarbon(target)) + M.visible_message("[src] mends [target]!") + M.adjustBruteLoss(-5) //HEALS + M.adjustOxyLoss(-5) + M.adjustBruteLoss(-5) + M.adjustFireLoss(-5) + M.adjustToxLoss(-5, TRUE) //heals TOXINLOVERs + M.adjustCloneLoss(-5) + M.adjustStaminaLoss(-5) + return From 3a6d72af5420fec4f975687480c44afd257cb9b8 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 28 Jul 2020 00:20:14 -0400 Subject: [PATCH 18/25] Update spellcard.dm --- .../projectiles/projectile/magic/spellcard.dm | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm index 5f9921bd62..f07c2f6f87 100644 --- a/code/modules/projectiles/projectile/magic/spellcard.dm +++ b/code/modules/projectiles/projectile/magic/spellcard.dm @@ -27,12 +27,12 @@ M.visible_message("[src] vanishes on contact with [target]!") return BULLET_ACT_BLOCK - if(iscarbon(target)) - M.adjust_fire_stacks(fire_stacks) - M.IgniteMob() - return - else - damage = 20 //If we are a simplemob we deal 5x damage + if(iscarbon(target)) + M.adjust_fire_stacks(fire_stacks) + M.IgniteMob() + return + else + damage = 20 //If we are a simplemob we deal 5x damage /obj/item/projectile/magic/spellcard/book/shock damage = 0 @@ -53,13 +53,13 @@ if(M.anti_magic_check()) M.visible_message("[src] vanishes on contact with [target]!") return BULLET_ACT_BLOCK - if(iscarbon(target)) - M.visible_message("[src] mends [target]!") - M.adjustBruteLoss(-5) //HEALS - M.adjustOxyLoss(-5) - M.adjustBruteLoss(-5) - M.adjustFireLoss(-5) - M.adjustToxLoss(-5, TRUE) //heals TOXINLOVERs - M.adjustCloneLoss(-5) - M.adjustStaminaLoss(-5) - return + if(iscarbon(target)) + M.visible_message("[src] mends [target]!") + M.adjustBruteLoss(-5) //HEALS + M.adjustOxyLoss(-5) + M.adjustBruteLoss(-5) + M.adjustFireLoss(-5) + M.adjustToxLoss(-5, TRUE) //heals TOXINLOVERs + M.adjustCloneLoss(-5) + M.adjustStaminaLoss(-5) + return From ccca78a1caa60ac180f2ebb8cdda80a497482390 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 28 Jul 2020 00:34:32 -0400 Subject: [PATCH 19/25] Update spellcard.dm --- code/modules/projectiles/projectile/magic/spellcard.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm index f07c2f6f87..5015a97e78 100644 --- a/code/modules/projectiles/projectile/magic/spellcard.dm +++ b/code/modules/projectiles/projectile/magic/spellcard.dm @@ -22,7 +22,6 @@ . = ..() var/mob/living/carbon/M = target if(ismob(target)) - var/mob/M = target if(M.anti_magic_check()) M.visible_message("[src] vanishes on contact with [target]!") return BULLET_ACT_BLOCK @@ -49,7 +48,6 @@ . = ..() var/mob/living/carbon/M = target if(ismob(target)) - var/mob/M = target if(M.anti_magic_check()) M.visible_message("[src] vanishes on contact with [target]!") return BULLET_ACT_BLOCK From 0ec756cce6c039526a139cf88a5456cc98d7277b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 3 Aug 2020 10:43:58 -0400 Subject: [PATCH 20/25] the all crate --- .../mining/lavaland/necropolis_chests.dm | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index d1b58c2ebe..3226008ecf 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -32,6 +32,9 @@ /obj/structure/closet/crate/necropolis/tendril/misc +/obj/structure/closet/crate/necropolis/tendril/all + desc = "It's watching you suspiciously." + /obj/structure/closet/crate/necropolis/tendril/magic/PopulateContents() var/loot = rand(1,10) switch(loot) @@ -121,6 +124,88 @@ new /obj/item/malf_upgrade else new /obj/item/disk/tech_disk/illegal + if(12) + new /obj/item/clothing/suit/space/hardsuit/cult(src) + if(13) + new /obj/item/katana/lavaland(src) + if(14) + if(prob(50)) + new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) + else + new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) + +/obj/structure/closet/crate/necropolis/tendril/all + var/loot = rand(1,31) + switch(loot) + if(1) + new /obj/item/shared_storage/red(src) + if(2) + new /obj/item/reagent_containers/glass/bottle/potion/flight(src) + if(3) + new /obj/item/ship_in_a_bottle(src) + if(4) + new /obj/item/voodoo(src) + if(5) + new /obj/item/book_of_babel(src) + if(6) + new /obj/item/jacobs_ladder(src) + if(7) + if(prob(50)) + new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) + else + new /obj/item/disk/design_disk/modkit_disc/bounty(src) + if(8) + new /obj/item/wisp_lantern(src) + if(9) + new /obj/item/pickaxe/rosegold(src) + if(10) + new /obj/item/bedsheet/cosmos(src) + new /obj/item/melee/skateboard/hoverboard(src) + if(11) + if(prob(50)) + new /obj/item/malf_upgrade + else + new /obj/item/disk/tech_disk/illegal + if(15) + new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old(src) + if(16) + new /obj/item/nullrod/scythe/talking(src) + if(17) + new /obj/item/nullrod/armblade(src) + if(18) + new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) + new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) + if(19) + new /obj/item/grenade/clusterbuster/inferno(src) + if(20) + new /obj/item/gun/magic/wand/book/shock(src) + if(21) + new /obj/item/gun/magic/wand/book/page(src) + if(22) + new /obj/item/gun/magic/wand/book/spark(src) + if(23) + new /obj/item/soulstone/anybody(src) + if(24) + new /obj/item/rod_of_asclepius(src) + if(25) + new /obj/item/organ/heart/cursed/wizard(src) + if(26) + new /obj/item/book/granter/spell/summonitem(src) + if(27) + new /obj/item/borg/upgrade/modkit/lifesteal(src) + new /obj/item/bedsheet/cult(src) + if(28) + new /obj/item/clothing/neck/necklace/memento_mori(src) + if(28) + new /obj/item/warp_cube/red(src) + if(29) + new /obj/item/immortality_talisman(src) + if(30) + new /obj/item/gun/magic/wand/book/healing(src) + if(31) + new /obj/item/reagent_containers/glass/bottle/ichor/red(src) + new /obj/item/reagent_containers/glass/bottle/ichor/blue(src) + new /obj/item/reagent_containers/glass/bottle/ichor/green(src) //KA modkit design discs /obj/item/disk/design_disk/modkit_disc From b3fea77468682ab7a086abf5b275e5e07123eb88 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 3 Aug 2020 10:45:01 -0400 Subject: [PATCH 21/25] Update necropolis_tendril.dm --- code/game/objects/structures/lavaland/necropolis_tendril.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index 425483d8e6..edc4f0c91f 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -10,7 +10,7 @@ max_mobs = 3 max_integrity = 250 mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril) - var/loot_type = /obj/structure/closet/crate/necropolis/tendril/magic + var/loot_type = /obj/structure/closet/crate/necropolis/tendril/all move_resist=INFINITY // just killing it tears a massive hole in the ground, let's not move it anchored = TRUE @@ -22,11 +22,9 @@ /obj/structure/spawner/lavaland/goliath mob_types = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril) - loot_type = /obj/structure/closet/crate/necropolis/tendril/weapon_armor /obj/structure/spawner/lavaland/legion mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril) - loot_type = /obj/structure/closet/crate/necropolis/tendril/misc /obj/structure/spawner/lavaland/icewatcher mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing) From dc4d83d2db151a7a4f37dd257b1f23e1c8b740b9 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 3 Aug 2020 11:06:00 -0400 Subject: [PATCH 22/25] Update necropolis_chests.dm --- code/modules/mining/lavaland/necropolis_chests.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 4041108777..a42fce3f7c 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -134,7 +134,7 @@ else new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) -/obj/structure/closet/crate/necropolis/tendril/all +/obj/structure/closet/crate/necropolis/tendril/all/PopulateContents() var/loot = rand(1,31) switch(loot) if(1) From 3ae10ac826b990faa1f3e4f00dd2c6f3fe716469 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Thu, 6 Aug 2020 13:09:41 -0400 Subject: [PATCH 23/25] update? --- _maps/map_files/MetaStation/MetaStation.dmm | 71 +++-- code/__DEFINES/DNA.dm | 4 + code/__DEFINES/admin.dm | 1 + code/__DEFINES/combat.dm | 6 +- code/__DEFINES/dcs/signals.dm | 4 +- code/__DEFINES/is_helpers.dm | 8 - code/__DEFINES/misc.dm | 3 + code/__DEFINES/storage/_storage.dm | 2 +- code/__DEFINES/wounds.dm | 114 ++++++-- code/_onclick/item_attack.dm | 19 +- code/controllers/subsystem/persistence.dm | 4 +- .../subsystem/processing/circuit.dm | 3 - code/controllers/subsystem/ticker.dm | 3 +- code/datums/components/butchering.dm | 2 +- code/datums/components/embedded.dm | 31 ++- code/datums/components/pellet_cloud.dm | 55 +++- code/datums/elements/embed.dm | 56 ++-- code/datums/elements/photosynthesis.dm | 2 +- code/datums/explosion.dm | 14 +- code/datums/mutations/actions.dm | 2 +- code/datums/mutations/hulk.dm | 18 ++ code/datums/status_effects/debuffs.dm | 2 +- code/datums/status_effects/wound_effects.dm | 31 ++- code/datums/traits/negative.dm | 8 +- code/datums/wounds/_scars.dm | 38 ++- code/datums/wounds/_wounds.dm | 51 ++-- code/datums/wounds/bones.dm | 197 ++++++-------- code/datums/wounds/burns.dm | 111 +++----- code/datums/wounds/loss.dm | 41 +++ code/datums/wounds/pierce.dm | 170 ++++++++++++ code/datums/wounds/{cuts.dm => slash.dm} | 212 +++++++-------- .../game/gamemodes/clown_ops/clown_weapons.dm | 2 +- code/game/machinery/doors/airlock.dm | 1 - code/game/machinery/doors/door.dm | 3 +- .../machinery/porta_turret/portable_turret.dm | 14 +- code/game/objects/items.dm | 10 +- code/game/objects/items/chainsaw.dm | 6 +- code/game/objects/items/dualsaber.dm | 2 +- code/game/objects/items/fireaxe.dm | 5 +- code/game/objects/items/holy_weapons.dm | 18 +- .../objects/items/implants/implant_misc.dm | 17 ++ code/game/objects/items/kitchen.dm | 7 +- code/game/objects/items/latexballoon.dm | 2 +- code/game/objects/items/melee/energy.dm | 8 +- code/game/objects/items/melee/misc.dm | 6 +- code/game/objects/items/melee/transforming.dm | 2 +- code/game/objects/items/pitchfork.dm | 2 +- code/game/objects/items/sharpener.dm | 2 +- code/game/objects/items/shrapnel.dm | 27 +- code/game/objects/items/spear.dm | 6 +- code/game/objects/items/stacks/medical.dm | 40 ++- .../game/objects/items/stacks/sheets/glass.dm | 2 +- code/game/objects/items/storage/_storage.dm | 3 +- code/game/objects/items/storage/toolbox.dm | 3 +- .../game/objects/items/storage/uplink_kits.dm | 8 + code/game/objects/items/tools/crowbar.dm | 3 + code/game/objects/items/tools/screwdriver.dm | 3 + code/game/objects/items/tools/weldingtool.dm | 2 + code/game/objects/items/tools/wrench.dm | 3 + code/game/objects/items/toys.dm | 4 +- code/game/objects/items/weaponry.dm | 20 +- code/game/turfs/simulated/walls.dm | 37 ++- code/modules/admin/verbs/randomverbs.dm | 95 ++++++- .../bloodsucker/bloodsucker_life.dm | 6 +- .../bloodsucker/datum_bloodsucker.dm | 3 + .../bloodsucker/objects/bloodsucker_crypt.dm | 4 +- .../changeling/powers/mutations.dm | 2 +- .../changeling/powers/regenerate.dm | 4 +- .../clock_weapons/ratvarian_spear.dm | 2 +- code/modules/antagonists/cult/cult_items.dm | 6 +- .../antagonists/slaughter/slaughter.dm | 2 +- .../antagonists/wizard/equipment/artefact.dm | 2 +- code/modules/cargo/packs/goodies.dm | 6 + code/modules/cargo/packs/medical.dm | 15 + code/modules/client/preferences.dm | 3 +- code/modules/clothing/glasses/_glasses.dm | 8 +- code/modules/clothing/glasses/hud.dm | 4 +- .../clothing/spacesuits/_spacesuits.dm | 4 +- .../modules/clothing/spacesuits/chronosuit.dm | 4 +- code/modules/clothing/spacesuits/hardsuit.dm | 14 +- .../clothing/spacesuits/miscellaneous.dm | 48 ++-- code/modules/clothing/spacesuits/plasmamen.dm | 12 +- code/modules/clothing/spacesuits/syndi.dm | 4 +- code/modules/clothing/suits/armor.dm | 6 +- .../under/jobs/Plasmaman/civilian_service.dm | 2 +- .../under/jobs/Plasmaman/engineering.dm | 2 +- .../clothing/under/jobs/Plasmaman/medsci.dm | 2 +- .../clothing/under/jobs/Plasmaman/security.dm | 2 +- .../clothing/under/jobs/civilian/civilian.dm | 2 +- .../clothing/under/jobs/engineering.dm | 4 +- code/modules/clothing/under/jobs/medical.dm | 14 +- code/modules/clothing/under/jobs/rnd.dm | 8 +- code/modules/clothing/under/miscellaneous.dm | 2 +- code/modules/clothing/under/syndicate.dm | 20 +- code/modules/events/travelling_trader.dm | 33 ++- code/modules/food_and_drinks/drinks/drinks.dm | 25 ++ .../food_and_drinks/drinks/drinks/bottle.dm | 2 +- code/modules/food_and_drinks/food/snacks.dm | 16 +- .../food_and_drinks/recipes/drinks_recipes.dm | 95 +++++-- .../browserassets/css/browserOutput.css | 8 +- code/modules/hydroponics/grown/banana.dm | 6 + code/modules/hydroponics/grown/chili.dm | 3 +- code/modules/hydroponics/hydroitemdefines.dm | 2 +- code/modules/instruments/songs/_song.dm | 16 ++ code/modules/instruments/songs/editor.dm | 5 +- .../integrated_electronics/core/assemblies.dm | 16 -- code/modules/jobs/job_types/detective.dm | 2 +- .../jobs/job_types/head_of_security.dm | 2 +- .../jobs/job_types/security_officer.dm | 2 +- code/modules/jobs/job_types/warden.dm | 2 +- code/modules/language/language_holder.dm | 3 +- .../mining/equipment/kinetic_crusher.dm | 16 +- code/modules/mining/equipment/mining_tools.dm | 4 +- .../mining/lavaland/necropolis_chests.dm | 7 +- code/modules/mining/machine_vending.dm | 3 +- .../modules/mob/dead/new_player/new_player.dm | 2 - code/modules/mob/living/bloodcrawl.dm | 4 +- code/modules/mob/living/carbon/carbon.dm | 39 ++- .../mob/living/carbon/carbon_defense.dm | 48 +++- .../modules/mob/living/carbon/damage_procs.dm | 4 +- code/modules/mob/living/carbon/examine.dm | 5 +- .../mob/living/carbon/human/damage_procs.dm | 2 +- code/modules/mob/living/carbon/human/dummy.dm | 1 - .../mob/living/carbon/human/examine.dm | 25 +- .../mob/living/carbon/human/human_helpers.dm | 24 +- .../mob/living/carbon/human/species.dm | 32 ++- .../carbon/human/species_types/abductors.dm | 2 +- .../carbon/human/species_types/angel.dm | 2 +- .../carbon/human/species_types/bugmen.dm | 2 +- .../carbon/human/species_types/dullahan.dm | 4 +- .../carbon/human/species_types/dwarves.dm | 2 +- .../carbon/human/species_types/flypeople.dm | 2 +- .../carbon/human/species_types/furrypeople.dm | 2 +- .../carbon/human/species_types/humans.dm | 2 +- .../living/carbon/human/species_types/ipc.dm | 2 +- .../carbon/human/species_types/jellypeople.dm | 2 +- .../human/species_types/lizardpeople.dm | 2 +- .../carbon/human/species_types/mushpeople.dm | 2 +- .../carbon/human/species_types/plasmamen.dm | 2 +- .../carbon/human/species_types/podpeople.dm | 2 +- .../human/species_types/shadowpeople.dm | 6 +- .../carbon/human/species_types/skeletons.dm | 2 +- .../carbon/human/species_types/synthliz.dm | 2 +- .../carbon/human/species_types/vampire.dm | 2 +- .../carbon/human/species_types/zombies.dm | 10 +- code/modules/mob/living/damage_procs.dm | 4 +- code/modules/mob/living/living.dm | 66 +++-- code/modules/mob/living/living_defense.dm | 15 +- .../mob/living/silicon/damage_procs.dm | 2 +- .../modules/mob/living/silicon/robot/emote.dm | 8 +- .../living/simple_animal/guardian/guardian.dm | 50 +++- .../mob/living/simple_animal/hostile/bear.dm | 2 +- .../living/simple_animal/hostile/syndicate.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 2 +- code/modules/mob/mob_defines.dm | 2 +- code/modules/mob/typing_indicator.dm | 12 +- code/modules/ninja/energy_katana.dm | 2 +- .../ninja/suit/n_suit_verbs/ninja_stars.dm | 2 +- code/modules/paperwork/pen.dm | 5 +- .../projectiles/boxes_magazines/ammo_boxes.dm | 2 +- code/modules/projectiles/gun.dm | 3 +- .../projectiles/guns/energy/special.dm | 2 +- code/modules/projectiles/guns/magic/staff.dm | 2 +- code/modules/projectiles/projectile.dm | 15 +- .../modules/projectiles/projectile/bullets.dm | 10 +- .../projectiles/projectile/bullets/lmg.dm | 10 +- .../projectiles/projectile/bullets/pistol.dm | 2 + .../projectile/bullets/revolver.dm | 16 +- .../projectiles/projectile/bullets/rifle.dm | 3 + .../projectiles/projectile/bullets/shotgun.dm | 29 +- .../projectiles/projectile/bullets/smg.dm | 6 + .../chemistry/reagents/drink_reagents.dm | 101 ++++++- .../chemistry/reagents/medicine_reagents.dm | 68 ++++- .../chemistry/reagents/other_reagents.dm | 11 +- .../chemistry/reagents/toxin_reagents.dm | 8 + .../reagents/chemistry/recipes/medicine.dm | 12 + .../reagents/reagent_containers/hypospray.dm | 9 +- .../reagents/reagent_containers/medspray.dm | 3 + .../reagents/reagent_containers/syringes.dm | 4 + code/modules/surgery/bodyparts/_bodyparts.dm | 257 ++++++++++++++---- .../surgery/bodyparts/dismemberment.dm | 61 ++++- code/modules/surgery/bodyparts/head.dm | 3 +- code/modules/surgery/bodyparts/parts.dm | 2 +- code/modules/surgery/bone_mending.dm | 4 +- code/modules/surgery/burn_dressing.dm | 3 +- code/modules/surgery/organs/tails.dm | 16 +- code/modules/surgery/repair_puncture.dm | 108 ++++++++ code/modules/surgery/tools.dm | 14 +- .../uplink/uplink_items/uplink_dangerous.dm | 11 + .../uplink/uplink_items/uplink_devices.dm | 6 + .../uplink/uplink_items/uplink_implants.dm | 7 + code/modules/vending/_vending.dm | 5 +- code/modules/vending/coffee.dm | 10 +- code/modules/zombie/items.dm | 4 +- html/changelog.html | 63 +++++ html/changelogs/.all_changelog.yml | 40 +++ html/changelogs/AutoChangeLog-pr-12969.yml | 4 + html/changelogs/AutoChangeLog-pr-13001.yml | 4 + html/changelogs/AutoChangeLog-pr-13004.yml | 4 - html/changelogs/AutoChangeLog-pr-13006.yml | 4 + html/changelogs/AutoChangeLog-pr-13032.yml | 4 + html/changelogs/AutoChangeLog-pr-13035.yml | 4 + icons/mob/clothing/back.dmi | Bin 107651 -> 107847 bytes .../mob/inhands/weapons/hammers_lefthand.dmi | Bin 3207 -> 1897 bytes .../mob/inhands/weapons/hammers_righthand.dmi | Bin 3491 -> 1750 bytes icons/obj/implants.dmi | Bin 2638 -> 2768 bytes interface/stylesheet.dm | 7 +- sound/effects/{ => wounds}/blood1.ogg | Bin sound/effects/{ => wounds}/blood2.ogg | Bin sound/effects/{ => wounds}/blood3.ogg | Bin sound/effects/{ => wounds}/crack1.ogg | Bin sound/effects/{ => wounds}/crack2.ogg | Bin sound/effects/wounds/crackandbleed.ogg | Bin 0 -> 15662 bytes sound/effects/wounds/pierce1.ogg | Bin 0 -> 8726 bytes sound/effects/wounds/pierce2.ogg | Bin 0 -> 17779 bytes sound/effects/wounds/pierce3.ogg | Bin 0 -> 19758 bytes sound/effects/{ => wounds}/sizzle1.ogg | Bin sound/effects/{ => wounds}/sizzle2.ogg | Bin .../CitadelStationHasSeenBetterDays.ogg | Bin 0 -> 57606 bytes sound/weapons/shot.ogg | Bin 0 -> 10751 bytes strings/wounds/bone_scar_desc.json | 26 ++ strings/wounds/flesh_scar_desc.json | 86 ++++++ strings/wounds/scar_loc.json | 52 ++++ tgstation.dme | 5 +- tgui/yarn.lock | 12 +- 225 files changed, 2646 insertions(+), 1039 deletions(-) create mode 100644 code/datums/wounds/loss.dm create mode 100644 code/datums/wounds/pierce.dm rename code/datums/wounds/{cuts.dm => slash.dm} (60%) create mode 100644 code/modules/surgery/repair_puncture.dm create mode 100644 html/changelogs/AutoChangeLog-pr-12969.yml create mode 100644 html/changelogs/AutoChangeLog-pr-13001.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13004.yml create mode 100644 html/changelogs/AutoChangeLog-pr-13006.yml create mode 100644 html/changelogs/AutoChangeLog-pr-13032.yml create mode 100644 html/changelogs/AutoChangeLog-pr-13035.yml rename sound/effects/{ => wounds}/blood1.ogg (100%) rename sound/effects/{ => wounds}/blood2.ogg (100%) rename sound/effects/{ => wounds}/blood3.ogg (100%) rename sound/effects/{ => wounds}/crack1.ogg (100%) rename sound/effects/{ => wounds}/crack2.ogg (100%) create mode 100644 sound/effects/wounds/crackandbleed.ogg create mode 100644 sound/effects/wounds/pierce1.ogg create mode 100644 sound/effects/wounds/pierce2.ogg create mode 100644 sound/effects/wounds/pierce3.ogg rename sound/effects/{ => wounds}/sizzle1.ogg (100%) rename sound/effects/{ => wounds}/sizzle2.ogg (100%) create mode 100644 sound/roundend/CitadelStationHasSeenBetterDays.ogg create mode 100644 sound/weapons/shot.ogg create mode 100644 strings/wounds/bone_scar_desc.json create mode 100644 strings/wounds/flesh_scar_desc.json create mode 100644 strings/wounds/scar_loc.json diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index fbd4c1bf39..6415c984bf 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -32681,6 +32681,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/light{ + dir = 1; + light_color = "#cee5d2" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "blC" = ( @@ -36118,13 +36122,9 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bsf" = ( -/obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "bsg" = ( @@ -37682,16 +37682,10 @@ /turf/closed/wall, /area/aisat) "bvu" = ( -/obj/structure/table/wood, /obj/machinery/light/small{ dir = 8 }, -/obj/item/radio/off{ - pixel_y = 4 - }, -/obj/item/screwdriver{ - pixel_y = 10 - }, +/obj/machinery/announcement_system, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bvv" = ( @@ -40188,12 +40182,15 @@ /area/tcommsat/computer) "bAW" = ( /obj/structure/table/wood, -/obj/item/folder/blue, /obj/machinery/status_display/evac{ pixel_y = 31 }, -/obj/item/folder/blue, -/obj/item/pen, +/obj/item/radio/off{ + pixel_y = 4 + }, +/obj/item/screwdriver{ + pixel_y = 10 + }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bAX" = ( @@ -42716,9 +42713,12 @@ /turf/open/floor/carpet, /area/crew_quarters/theatre) "bGh" = ( -/obj/machinery/announcement_system, -/turf/open/floor/plasteel/grimy, -/area/tcommsat/computer) +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "bGj" = ( /obj/machinery/vending/cola/random, /obj/machinery/newscaster{ @@ -81595,6 +81595,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"jQK" = ( +/obj/structure/lattice, +/turf/closed/wall/r_wall, +/area/aisat) "jRo" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -81912,6 +81916,16 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/hallway/primary/port) +"nix" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) "njd" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -82580,6 +82594,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"txh" = ( +/obj/machinery/door/airlock/hatch{ + name = "Telecomms Control Room"; + req_one_access_txt = "19; 61" + }, +/turf/open/floor/plasteel/dark, +/area/tcommsat/computer) "txj" = ( /obj/structure/chair/office/light{ dir = 1 @@ -136361,9 +136382,9 @@ bnw bpJ brW aRy -bvt -aaa -aTU +aRy +aRy +jQK aaa aaa aaa @@ -136617,9 +136638,9 @@ blC bnx bpK bsf -aRy -aRy -aRy +bGh +nix +bGh aRy aRy aRy @@ -136876,7 +136897,7 @@ bpL brY btL btL -btL +txh btL btL bCD @@ -137133,7 +137154,7 @@ bpM brZ btL bvu -bGh +bxq bzn bAU bCD diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index d1c1d309cd..035563627f 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -144,6 +144,10 @@ #define WINGCOLOR 26 #define CAN_SCAR 27 // If this species can be scarred (fleshy) +/// Used for determining which wounds are applicable to this species. +#define HAS_FLESH 28 /// if we have flesh (can suffer slash/piercing/burn wounds, requires they don't have NOBLOOD) +#define HAS_BONE 29 /// if we have bones (can suffer bone wounds) + //organ slots #define ORGAN_SLOT_BRAIN "brain" #define ORGAN_SLOT_APPENDIX "appendix" diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 198356f804..97f07acc05 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -80,6 +80,7 @@ #define ADMIN_PUNISHMENT_SCARIFY "Scarify" #define ADMIN_PUNISHMENT_PICKLE "Pickle-ify" #define ADMIN_PUNISHMENT_FRY "Fry" +#define ADMIN_PUNISHMENT_PERFORATE ":B:erforate" #define AHELP_ACTIVE 1 #define AHELP_CLOSED 2 diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 6a60768875..14d62f7978 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -209,9 +209,9 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list( #define GUN_AIMING_TIME (2 SECONDS) //Object/Item sharpness -#define IS_BLUNT 0 -#define IS_SHARP 1 -#define IS_SHARP_ACCURATE 2 +#define SHARP_NONE 0 +#define SHARP_EDGED 1 +#define SHARP_POINTY 2 //His Grace. #define HIS_GRACE_SATIATED 0 //He hungers not. If bloodthirst is set to this, His Grace is asleep. diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index 5b8a4d5fc3..7e1a83486d 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -356,8 +356,8 @@ #define COMSIG_PEN_ROTATED "pen_rotated" //called after rotation in /obj/item/pen/attack_self(): (rotation, mob/living/carbon/user) // /obj/item/projectile signals (sent to the firer) -#define COMSIG_PROJECTILE_SELF_ON_HIT "projectile_self_on_hit" // from base of /obj/item/projectile/proc/on_hit(): (atom/movable/firer, atom/target, Angle) -#define COMSIG_PROJECTILE_ON_HIT "projectile_on_hit" // from base of /obj/item/projectile/proc/on_hit(): (atom/movable/firer, atom/target, Angle) +#define COMSIG_PROJECTILE_SELF_ON_HIT "projectile_self_on_hit" ///from base of /obj/item/projectile/proc/on_hit(): (atom/movable/firer, atom/target, Angle, hit_limb) +#define COMSIG_PROJECTILE_ON_HIT "projectile_on_hit" ///from base of /obj/item/projectile/proc/on_hit(): (atom/movable/firer, atom/target, Angle, hit_limb) #define COMSIG_PROJECTILE_BEFORE_FIRE "projectile_before_fire" // from base of /obj/item/projectile/proc/fire(): (obj/item/projectile, atom/original_target) #define COMSIG_PROJECTILE_FIRE "projectile_fire" ///from the base of /obj/item/projectile/proc/fire(): () #define COMSIG_PROJECTILE_RANGE_OUT "projectile_range_out" // sent to targets during the process_hit proc of projectiles diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 964c4e911e..3aa5a07480 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -199,14 +199,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define isclothing(A) (istype(A, /obj/item/clothing)) -GLOBAL_LIST_INIT(pointed_types, typecacheof(list( - /obj/item/pen, - /obj/item/screwdriver, - /obj/item/reagent_containers/syringe, - /obj/item/kitchen/fork))) - -#define is_pointed(W) (is_type_in_typecache(W, GLOB.pointed_types)) - #define isbodypart(A) (istype(A, /obj/item/bodypart)) #define isprojectile(A) (istype(A, /obj/item/projectile)) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 120fdcb72d..d294c69972 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -434,6 +434,9 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S #define ION_FILE "ion_laws.json" #define REDPILL_FILE "redpill.json" #define PIRATE_NAMES_FILE "pirates.json" +#define FLESH_SCAR_FILE "wounds/flesh_scar_desc.json" +#define BONE_SCAR_FILE "wounds/bone_scar_desc.json" +#define SCAR_LOC_FILE "wounds/scar_loc.json" //Fullscreen overlay resolution in tiles. diff --git a/code/__DEFINES/storage/_storage.dm b/code/__DEFINES/storage/_storage.dm index 3a05293d2d..6eb613b423 100644 --- a/code/__DEFINES/storage/_storage.dm +++ b/code/__DEFINES/storage/_storage.dm @@ -19,7 +19,7 @@ /// Size of EACH left/right border icon for volumetric boxes #define VOLUMETRIC_STORAGE_BOX_BORDER_SIZE 1 /// Minimum pixels an item must have in volumetric scaled storage UI -#define MINIMUM_PIXELS_PER_ITEM 8 +#define MINIMUM_PIXELS_PER_ITEM 16 /// Maximum number of objects that will be allowed to be displayed using the volumetric display system. Arbitrary number to prevent server lockups. #define MAXIMUM_VOLUMETRIC_ITEMS 256 /// How much padding to give between items diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm index b993429961..73ada71423 100644 --- a/code/__DEFINES/wounds.dm +++ b/code/__DEFINES/wounds.dm @@ -1,4 +1,13 @@ -#define WOUND_DAMAGE_EXPONENT 1.4 + +#define WOUND_DAMAGE_EXPONENT 1.225 + +/// an attack must do this much damage after armor in order to roll for being a wound (incremental pressure damage need not apply) +#define WOUND_MINIMUM_DAMAGE 5 +/// an attack must do this much damage after armor in order to be eliigible to dismember a suitably mushed bodypart +#define DISMEMBER_MINIMUM_DAMAGE 10 +/// any damage dealt over this is ignored for damage rolls unless the target has the frail quirk (35^1.4=145) +#define WOUND_MAX_CONSIDERED_DAMAGE 35 + #define WOUND_SEVERITY_TRIVIAL 0 // for jokey/meme wounds like stubbed toe, no standard messages/sounds or second winds #define WOUND_SEVERITY_MODERATE 1 @@ -6,38 +15,105 @@ #define WOUND_SEVERITY_CRITICAL 3 #define WOUND_SEVERITY_LOSS 4 // theoretical total limb loss, like dismemberment for cuts -#define WOUND_BRUTE 0 -#define WOUND_SHARP 1 -#define WOUND_BURN 2 +/// any brute weapon/attack that doesn't have sharpness. rolls for blunt bone wounds +#define WOUND_BLUNT 1 +/// any brute weapon/attack with sharpness = SHARP_EDGED. rolls for slash wounds +#define WOUND_SLASH 2 +/// any brute weapon/attack with sharpness = SHARP_POINTY. rolls for piercing wounds +#define WOUND_PIERCE 3 +/// any concentrated burn attack (lasers really). rolls for burning wounds +#define WOUND_BURN 4 // How much determination reagent to add each time someone gains a new wound in [/datum/wound/proc/second_wind()] #define WOUND_DETERMINATION_MODERATE 1 #define WOUND_DETERMINATION_SEVERE 2.5 #define WOUND_DETERMINATION_CRITICAL 5 +#define WOUND_DETERMINATION_LOSS 7.5 +/// the max amount of determination you can have #define WOUND_DETERMINATION_MAX 10 -// set wound_bonus on an item or attack to this to disable checking wounding for the attack +/// set wound_bonus on an item or attack to this to disable checking wounding for the attack #define CANT_WOUND -100 // list in order of highest severity to lowest -#define WOUND_LIST_BONE list(/datum/wound/brute/bone/critical, /datum/wound/brute/bone/severe, /datum/wound/brute/bone/moderate) -#define WOUND_LIST_CUT list(/datum/wound/brute/cut/loss, /datum/wound/brute/cut/critical, /datum/wound/brute/cut/severe, /datum/wound/brute/cut/moderate) -#define WOUND_LIST_BURN list(/datum/wound/burn/critical, /datum/wound/burn/severe, /datum/wound/burn/moderate) +GLOBAL_LIST_INIT(global_wound_types, list(WOUND_BLUNT = list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate), + WOUND_SLASH = list(/datum/wound/slash/critical, /datum/wound/slash/severe, /datum/wound/slash/moderate), + WOUND_PIERCE = list(/datum/wound/pierce/critical, /datum/wound/pierce/severe, /datum/wound/pierce/moderate), + WOUND_BURN = list(/datum/wound/burn/critical, /datum/wound/burn/severe, /datum/wound/burn/moderate) + )) + +GLOBAL_LIST_INIT(global_all_wound_types, list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate, + /datum/wound/slash/critical, /datum/wound/slash/severe, /datum/wound/slash/moderate, + /datum/wound/pierce/critical, /datum/wound/pierce/severe, /datum/wound/pierce/moderate, + /datum/wound/burn/critical, /datum/wound/burn/severe, /datum/wound/burn/moderate)) // Thresholds for infection for burn wounds, once infestation hits each threshold, things get steadily worse -#define WOUND_INFECTION_MODERATE 4 // below this has no ill effects from infection -#define WOUND_INFECTION_SEVERE 8 // then below here, you ooze some pus and suffer minor tox damage, but nothing serious -#define WOUND_INFECTION_CRITICAL 12 // then below here, your limb occasionally locks up from damage and infection and briefly becomes disabled. Things are getting really bad -#define WOUND_INFECTION_SEPTIC 20 // below here, your skin is almost entirely falling off and your limb locks up more frequently. You are within a stone's throw of septic paralysis and losing the limb +/// below this has no ill effects from infection +#define WOUND_INFECTION_MODERATE 4 +/// then below here, you ooze some pus and suffer minor tox damage, but nothing serious +#define WOUND_INFECTION_SEVERE 8 +/// then below here, your limb occasionally locks up from damage and infection and briefly becomes disabled. Things are getting really bad +#define WOUND_INFECTION_CRITICAL 12 +/// below here, your skin is almost entirely falling off and your limb locks up more frequently. You are within a stone's throw of septic paralysis and losing the limb +#define WOUND_INFECTION_SEPTIC 20 // above WOUND_INFECTION_SEPTIC, your limb is completely putrid and you start rolling to lose the entire limb by way of paralyzation. After 3 failed rolls (~4-5% each probably), the limb is paralyzed -#define WOUND_BURN_SANITIZATION_RATE 0.15 // how quickly sanitization removes infestation and decays per tick -#define WOUND_CUT_MAX_BLOODFLOW 8 // how much blood you can lose per tick per cut max. 8 is a LOT of blood for one cut so don't worry about hitting it easily -#define WOUND_BONE_HEAD_TIME_VARIANCE 20 // if we suffer a bone wound to the head that creates brain traumas, the timer for the trauma cycle is +/- by this percent (0-100) + +/// how quickly sanitization removes infestation and decays per tick +#define WOUND_BURN_SANITIZATION_RATE 0.15 +/// how much blood you can lose per tick per slash max. 8 is a LOT of blood for one cut so don't worry about hitting it easily +#define WOUND_SLASH_MAX_BLOODFLOW 8 +/// dead people don't bleed, but they can clot! this is the minimum amount of clotting per tick on dead people, so even critical cuts will slowly clot in dead people +#define WOUND_SLASH_DEAD_CLOT_MIN 0.05 +/// if we suffer a bone wound to the head that creates brain traumas, the timer for the trauma cycle is +/- by this percent (0-100) +#define WOUND_BONE_HEAD_TIME_VARIANCE 20 // The following are for persistent scar save formats -#define SCAR_SAVE_ZONE 1 // The body_zone we're applying to on granting -#define SCAR_SAVE_DESC 2 // The description we're loading -#define SCAR_SAVE_PRECISE_LOCATION 3 // The precise location we're loading -#define SCAR_SAVE_SEVERITY 4 // The severity the scar had +/// The version number of the scar we're saving +#define SCAR_SAVE_VERS 1 +/// The body_zone we're applying to on granting +#define SCAR_SAVE_ZONE 2 +/// The description we're loading +#define SCAR_SAVE_DESC 3 +/// The precise location we're loading +#define SCAR_SAVE_PRECISE_LOCATION 4 +/// The severity the scar had +#define SCAR_SAVE_SEVERITY 5 +///how many fields there are above (NOT INCLUDING THIS OBVIOUSLY) +#define SCAR_SAVE_LENGTH 5 + +// increment this number when you update the persistent scarring format in a way that invalidates previous saved scars (new fields, reordering, etc) +/// saved scars with a version lower than this will be discarded +#define SCAR_CURRENT_VERSION 1 + + +// With the wounds pt. 2 update, general dismemberment now requires 2 things for a limb to be dismemberable (bone only creatures just need the second): +// 1. Skin is mangled: A critical slash or pierce wound on that limb +// 2. Bone is mangled: At least a severe bone wound on that limb +// see [/obj/item/bodypart/proc/get_mangled_state] for more information +#define BODYPART_MANGLED_NONE 0 +#define BODYPART_MANGLED_BONE 1 +#define BODYPART_MANGLED_FLESH 2 +#define BODYPART_MANGLED_BOTH 3 + +// What kind of biology we have, and what wounds we can suffer, mostly relies on the HAS_FLESH and HAS_BONE species traits on human species +/// golems and androids, cannot suffer any wounds +#define BIO_INORGANIC 0 +/// skeletons and plasmemes, can only suffer bone wounds, only needs mangled bone to be able to dismember +#define BIO_JUST_BONE 1 +/// nothing right now, maybe slimepeople in the future, can only suffer slashing, piercing, and burn wounds +#define BIO_JUST_FLESH 2 +/// standard humanoids, can suffer all wounds, needs mangled bone and flesh to dismember +#define BIO_FLESH_BONE 3 + +/// If this wound requires having the HAS_FLESH flag for humanoids +#define FLESH_WOUND (1<<0) +/// If this wound requires having the HAS_BONE flag for humanaoids +#define BONE_WOUND (1<<1) +/// If having this wound counts as mangled flesh for dismemberment +#define MANGLES_FLESH (1<<2) +/// If having this wound counts as mangled bone for dismemberment +#define MANGLES_BONE (1<<3) +/// If this wound marks the limb as being allowed to have gauze applied +#define ACCEPTS_GAUZE (1<<4) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 6a26a6f116..9e88476513 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -238,25 +238,24 @@ else return clamp(w_class * 6, 10, 100) // Multiply the item's weight class by 6, then clamp the value between 10 and 100 -/mob/living/proc/send_item_attack_message(obj/item/I, mob/living/user, hit_area, current_force) +/mob/living/proc/send_item_attack_message(obj/item/I, mob/living/user, hit_area, obj/item/bodypart/hit_bodypart) var/message_verb = "attacked" - if(I.attack_verb && I.attack_verb.len) + if(length(I.attack_verb)) message_verb = "[pick(I.attack_verb)]" - if(current_force < I.force * FEEBLE_ATTACK_MSG_THRESHOLD) - message_verb = "[pick("feebly", "limply", "saplessly")] [message_verb]" else if(!I.force) return var/message_hit_area = "" if(hit_area) message_hit_area = " in the [hit_area]" - var/attack_message = "[src] has been [message_verb][message_hit_area] with [I]." + var/attack_message = "[src] is [message_verb][message_hit_area] with [I]!" + var/attack_message_local = "You're [message_verb][message_hit_area] with [I]!" if(user in viewers(src, null)) - attack_message = "[user] has [message_verb] [src][message_hit_area] with [I]!" + attack_message = "[user] [message_verb] [src][message_hit_area] with [I]!" + attack_message_local = "[user] [message_verb] you[message_hit_area] with [I]!" + if(user == src) + attack_message_local = "You [message_verb] yourself[message_hit_area] with [I]" visible_message("[attack_message]",\ - "[attack_message]", null, COMBAT_MESSAGE_RANGE) - if(hit_area == BODY_ZONE_HEAD) - if(prob(2)) - playsound(src, 'sound/weapons/dink.ogg', 30, 1) + "[attack_message_local]", null, COMBAT_MESSAGE_RANGE) return 1 /// How much stamina this takes to swing this is not for realism purposes hecc off. diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index b4a162c982..5b60747725 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -561,8 +561,8 @@ SUBSYSTEM_DEF(persistence) ending_human.client.prefs.scars_list["[ending_human.client.prefs.scars_index]"] = "" else for(var/k in ending_human.all_wounds) - var/datum/wound/W = k - W.remove_wound() // so we can get the scars for open wounds + var/datum/wound/iter_wound = k + iter_wound.remove_wound() // so we can get the scars for open wounds if(!ending_human.client) return ending_human.client.prefs.scars_list["[ending_human.client.prefs.scars_index]"] = ending_human.format_scars() diff --git a/code/controllers/subsystem/processing/circuit.dm b/code/controllers/subsystem/processing/circuit.dm index 880e7a16a8..ac720a7fb4 100644 --- a/code/controllers/subsystem/processing/circuit.dm +++ b/code/controllers/subsystem/processing/circuit.dm @@ -50,20 +50,17 @@ PROCESSING_SUBSYSTEM_DEF(circuit) /obj/item/electronic_assembly/simple, /obj/item/electronic_assembly/hook, /obj/item/electronic_assembly/pda, - /obj/item/electronic_assembly/dildo, /obj/item/electronic_assembly/small/default, /obj/item/electronic_assembly/small/cylinder, /obj/item/electronic_assembly/small/scanner, /obj/item/electronic_assembly/small/hook, /obj/item/electronic_assembly/small/box, - /obj/item/electronic_assembly/small/dildo, /obj/item/electronic_assembly/medium/default, /obj/item/electronic_assembly/medium/box, /obj/item/electronic_assembly/medium/clam, /obj/item/electronic_assembly/medium/medical, /obj/item/electronic_assembly/medium/gun, /obj/item/electronic_assembly/medium/radio, - /obj/item/electronic_assembly/medium/dildo, /obj/item/electronic_assembly/large/default, /obj/item/electronic_assembly/large/scope, /obj/item/electronic_assembly/large/terminal, diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 765f0c8382..0bc4e6665a 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -711,7 +711,8 @@ SUBSYSTEM_DEF(ticker) 'sound/roundend/yeehaw.ogg', 'sound/roundend/disappointed.ogg', 'sound/roundend/gondolabridge.ogg', - 'sound/roundend/haveabeautifultime.ogg'\ + 'sound/roundend/haveabeautifultime.ogg', + 'sound/roundend/CitadelStationHasSeenBetterDays.ogg'\ ) SEND_SOUND(world, sound(round_end_sound)) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index b5b8849155..4f56f58d23 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -67,7 +67,7 @@ H.apply_damage(source.force, BRUTE, BODY_ZONE_HEAD, wound_bonus=CANT_WOUND) // easy tiger, we'll get to that in a sec var/obj/item/bodypart/slit_throat = H.get_bodypart(BODY_ZONE_HEAD) if(slit_throat) - var/datum/wound/brute/cut/critical/screaming_through_a_slit_throat = new + var/datum/wound/slash/critical/screaming_through_a_slit_throat = new screaming_through_a_slit_throat.apply_wound(slit_throat) H.apply_status_effect(/datum/status_effect/neck_slice) diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm index ce124646f4..51098756d3 100644 --- a/code/datums/components/embedded.dm +++ b/code/datums/components/embedded.dm @@ -29,7 +29,6 @@ */ - /datum/component/embedded dupe_mode = COMPONENT_DUPE_ALLOWED var/obj/item/bodypart/limb @@ -139,30 +138,36 @@ limb.embedded_objects |= weapon // on the inside... on the inside... weapon.forceMove(victim) RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), .proc/byeItemCarbon) - + var/damage = 0 if(harmful) victim.visible_message("[weapon] embeds itself in [victim]'s [limb.name]!",ignored_mobs=victim) to_chat(victim, "[weapon] embeds itself in your [limb.name]!") victim.throw_alert("embeddedobject", /obj/screen/alert/embeddedobject) playsound(victim,'sound/weapons/bladeslice.ogg', 40) weapon.add_mob_blood(victim)//it embedded itself in you, of course it's bloody! - var/damage = weapon.w_class * impact_pain_mult - limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, wound_bonus=-30, sharpness = TRUE) + damage = weapon.w_class * impact_pain_mult SEND_SIGNAL(victim, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded) else victim.visible_message("[weapon] sticks itself to [victim]'s [limb.name]!",ignored_mobs=victim) to_chat(victim, "[weapon] sticks itself to your [limb.name]!") + if(damage > 0) + var/armor = victim.run_armor_check(limb.body_zone, "melee", "Your armor has protected your [limb.name].", "Your armor has softened a hit to your [limb.name].",weapon.armour_penetration) + limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, blocked=armor, sharpness = weapon.get_sharpness()) + /// Called every time a carbon with a harmful embed moves, rolling a chance for the item to cause pain. The chance is halved if the carbon is crawling or walking. /datum/component/embedded/proc/jostleCheck() var/mob/living/carbon/victim = parent - var/chance = jostle_chance + var/damage = weapon.w_class * pain_mult + var/pain_chance_current = jostle_chance if(victim.m_intent == MOVE_INTENT_WALK || !(victim.mobility_flags & MOBILITY_STAND)) - chance *= 0.5 + pain_chance_current *= 0.5 - if(harmful && prob(chance)) - var/damage = weapon.w_class * jostle_pain_mult + if(pain_stam_pct && IS_STAMCRIT(victim)) //if it's a less-lethal embed, give them a break if they're already stamcritted + pain_chance_current *= 0.2 + damage *= 0.5 + if(harmful && prob(pain_chance_current)) limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, wound_bonus = CANT_WOUND) to_chat(victim, "[weapon] embedded in your [limb.name] jostles and stings!") @@ -199,7 +204,7 @@ if(harmful) var/damage = weapon.w_class * remove_pain_mult - limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, sharpness=TRUE) //It hurts to rip it out, get surgery you dingus. + limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, wound_bonus = CANT_WOUND) //It hurts to rip it out, get surgery you dingus. victim.emote("scream") victim.visible_message("[victim] successfully rips [weapon] out of [victim.p_their()] [limb.name]!", "You successfully remove [weapon] from your [limb.name].") else @@ -279,11 +284,13 @@ limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, wound_bonus = CANT_WOUND) to_chat(victim, "[weapon] embedded in your [limb.name] hurts!") - if(prob(fall_chance)) + var/fall_chance_current = fall_chance + if(victim.mobility_flags & ~MOBILITY_STAND) + fall_chance_current *= 0.2 + + if(prob(fall_chance_current)) fallOutCarbon() - - //////////////////////////////////////// //////////////TURF PROCS//////////////// //////////////////////////////////////// diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm index 938d9f5f56..6a1028cc65 100644 --- a/code/datums/components/pellet_cloud.dm +++ b/code/datums/components/pellet_cloud.dm @@ -1,3 +1,8 @@ +// the following defines are used for [/datum/component/pellet_cloud/var/list/wound_info_by_part] to store the damage, wound_bonus, and bw_bonus for each bodypart hit +#define CLOUD_POSITION_DAMAGE 1 +#define CLOUD_POSITION_W_BONUS 2 +#define CLOUD_POSITION_BW_BONUS 3 + /* * This component is used when you want to create a bunch of shrapnel or projectiles (say, shrapnel from a fragmentation grenade, or buckshot from a shotgun) from a central point, * without necessarily printing a separate message for every single impact. This component should be instantiated right when you need it (like the moment of firing), then activated @@ -29,7 +34,10 @@ var/list/pellets = list() /// An associated list with the atom hit as the key and how many pellets they've eaten for the value, for printing aggregate messages var/list/targets_hit = list() - /// For grenades, any /mob/living's the grenade is moved onto, see [/datum/component/pellet_cloud/proc/handle_martyrs()] + + /// Another associated list for hit bodyparts on carbons so we can track how much wounding potential we have for each bodypart + var/list/wound_info_by_part = list() + /// For grenades, any /mob/living's the grenade is moved onto, see [/datum/component/pellet_cloud/proc/handle_martyrs] var/list/bodies /// For grenades, tracking people who die covering a grenade for achievement purposes, see [/datum/component/pellet_cloud/proc/handle_martyrs()] var/list/purple_hearts @@ -64,6 +72,7 @@ /datum/component/pellet_cloud/Destroy(force, silent) purple_hearts = null pellets = null + wound_info_by_part = null targets_hit = null bodies = null return ..() @@ -187,10 +196,26 @@ break ///One of our pellets hit something, record what it was and check if we're done (terminated == num_pellets) -/datum/component/pellet_cloud/proc/pellet_hit(obj/item/projectile/P, atom/movable/firer, atom/target, Angle) +/datum/component/pellet_cloud/proc/pellet_hit(obj/item/projectile/P, atom/movable/firer, atom/target, Angle, hit_zone) pellets -= P terminated++ hits++ + var/obj/item/bodypart/hit_part + if(iscarbon(target) && hit_zone) + var/mob/living/carbon/hit_carbon = target + hit_part = hit_carbon.get_bodypart(hit_zone) + if(hit_part) + target = hit_part + if(P.wound_bonus != CANT_WOUND) // handle wounding + // unfortunately, due to how pellet clouds handle finalizing only after every pellet is accounted for, that also means there might be a short delay in dealing wounds if one pellet goes wide + // while buckshot may reach a target or miss it all in one tick, we also have to account for possible ricochets that may take a bit longer to hit the target + if(isnull(wound_info_by_part[hit_part])) + wound_info_by_part[hit_part] = list(0, 0, 0) + wound_info_by_part[hit_part][CLOUD_POSITION_DAMAGE] += P.damage // these account for decay + wound_info_by_part[hit_part][CLOUD_POSITION_W_BONUS] += P.wound_bonus + wound_info_by_part[hit_part][CLOUD_POSITION_BW_BONUS] += P.bare_wound_bonus + P.wound_bonus = CANT_WOUND // actual wounding will be handled aggregate + targets_hit[target]++ if(targets_hit[target] == 1) RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE) @@ -231,13 +256,23 @@ for(var/atom/target in targets_hit) var/num_hits = targets_hit[target] UnregisterSignal(target, COMSIG_PARENT_QDELETING) - if(num_hits > 1) - target.visible_message("[target] is hit by [num_hits] [proj_name]s!", null, null, COMBAT_MESSAGE_RANGE, target) - to_chat(target, "You're hit by [num_hits] [proj_name]s!") - else - target.visible_message("[target] is hit by a [proj_name]!", null, null, COMBAT_MESSAGE_RANGE, target) - to_chat(target, "You're hit by a [proj_name]!") + var/obj/item/bodypart/hit_part + if(isbodypart(target)) + hit_part = target + target = hit_part.owner + var/damage_dealt = wound_info_by_part[hit_part][CLOUD_POSITION_DAMAGE] + var/w_bonus = wound_info_by_part[hit_part][CLOUD_POSITION_W_BONUS] + var/bw_bonus = wound_info_by_part[hit_part][CLOUD_POSITION_BW_BONUS] + var/wound_type = (initial(P.damage_type) == BRUTE) ? WOUND_BLUNT : WOUND_BURN // sharpness is handled in the wound rolling + wound_info_by_part[hit_part] = null + hit_part.painless_wound_roll(wound_type, damage_dealt, w_bonus, bw_bonus, initial(P.sharpness)) + if(num_hits > 1) + target.visible_message("[target] is hit by [num_hits] [proj_name]s[hit_part ? " in the [hit_part.name]" : ""]!", null, null, COMBAT_MESSAGE_RANGE, target) + to_chat(target, "You're hit by [num_hits] [proj_name]s[hit_part ? " in the [hit_part.name]" : ""]!") + else + target.visible_message("[target] is hit by a [proj_name][hit_part ? " in the [hit_part.name]" : ""]!", null, null, COMBAT_MESSAGE_RANGE, target) + to_chat(target, "You're hit by a [proj_name][hit_part ? " in the [hit_part.name]" : ""]!") UnregisterSignal(parent, COMSIG_PARENT_PREQDELETED) if(queued_delete) qdel(parent) @@ -281,3 +316,7 @@ targets_hit -= target bodies -= target purple_hearts -= target + +#undef CLOUD_POSITION_DAMAGE +#undef CLOUD_POSITION_W_BONUS +#undef CLOUD_POSITION_BW_BONUS diff --git a/code/datums/elements/embed.dm b/code/datums/elements/embed.dm index 8a7acde9cb..876414330f 100644 --- a/code/datums/elements/embed.dm +++ b/code/datums/elements/embed.dm @@ -2,7 +2,7 @@ The presence of this element allows an item (or a projectile carrying an item) to embed itself in a human or turf when it is thrown into a target (whether by hand, gun, or explosive wave) with either at least 4 throwspeed (EMBED_THROWSPEED_THRESHOLD) or ignore_throwspeed_threshold set to TRUE. Items meant to be used as shrapnel for projectiles should have ignore_throwspeed_threshold set to true. - Whether we're dealing with a direct /obj/item (throwing a knife at someone) or an /obj/projectile with a shrapnel_type, how we handle things plays out the same, with one extra step separating them. + Whether we're dealing with a direct /obj/item (throwing a knife at someone) or an /obj/item/projectile with a shrapnel_type, how we handle things plays out the same, with one extra step separating them. Items simply make their COMSIG_MOVABLE_IMPACT or COMSIG_MOVABLE_IMPACT_ZONE check (against a closed turf or a carbon, respectively), while projectiles check on COMSIG_PROJECTILE_SELF_ON_HIT. Upon a projectile hitting a valid target, it spawns whatever type of payload it has defined, then has that try to embed itself in the target on its own. @@ -37,10 +37,10 @@ if(!isitem(target) && !isprojectile(target)) return ELEMENT_INCOMPATIBLE + RegisterSignal(target, COMSIG_ELEMENT_ATTACH, .proc/severancePackage) if(isitem(target)) RegisterSignal(target, COMSIG_MOVABLE_IMPACT_ZONE, .proc/checkEmbedMob) RegisterSignal(target, COMSIG_MOVABLE_IMPACT, .proc/checkEmbedOther) - RegisterSignal(target, COMSIG_ELEMENT_ATTACH, .proc/severancePackage) RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/examined) RegisterSignal(target, COMSIG_EMBED_TRY_FORCE, .proc/tryForceEmbed) RegisterSignal(target, COMSIG_ITEM_DISABLE_EMBED, .proc/detachFromWeapon) @@ -68,7 +68,7 @@ if(isitem(target)) UnregisterSignal(target, list(COMSIG_MOVABLE_IMPACT_ZONE, COMSIG_ELEMENT_ATTACH, COMSIG_MOVABLE_IMPACT, COMSIG_PARENT_EXAMINE, COMSIG_EMBED_TRY_FORCE, COMSIG_ITEM_DISABLE_EMBED)) else - UnregisterSignal(target, list(COMSIG_PROJECTILE_SELF_ON_HIT)) + UnregisterSignal(target, list(COMSIG_PROJECTILE_SELF_ON_HIT, COMSIG_ELEMENT_ATTACH)) /// Checking to see if we're gonna embed into a human @@ -79,13 +79,13 @@ var/actual_chance = embed_chance if(!weapon.isEmbedHarmless()) // all the armor in the world won't save you from a kick me sign - var/armor = max(victim.run_armor_check(hit_zone, "bullet", silent=TRUE), victim.run_armor_check(hit_zone, "bomb", silent=TRUE)) // we'll be nice and take the better of bullet and bomb armor + var/armor = max(victim.run_armor_check(hit_zone, "bullet", silent=TRUE), victim.run_armor_check(hit_zone, "bomb", silent=TRUE)) * 0.5 // we'll be nice and take the better of bullet and bomb armor, halved if(armor) // we only care about armor penetration if there's actually armor to penetrate var/pen_mod = -armor + weapon.armour_penetration // even a little bit of armor can make a big difference for shrapnel with large negative armor pen actual_chance += pen_mod // doing the armor pen as a separate calc just in case this ever gets expanded on if(actual_chance <= 0) - victim.visible_message("[weapon] bounces off [victim]'s armor!", "[weapon] bounces off your armor!", vision_distance = COMBAT_MESSAGE_RANGE) + victim.visible_message("[weapon] bounces off [victim]'s armor, unable to embed!", "[weapon] bounces off your armor, unable to embed!", vision_distance = COMBAT_MESSAGE_RANGE) return var/roll_embed = prob(actual_chance) @@ -147,7 +147,7 @@ return TRUE ///A different embed element has been attached, so we'll detach and let them handle things -/datum/element/embed/proc/severancePackage(obj/item/weapon, datum/element/E) +/datum/element/embed/proc/severancePackage(obj/weapon, datum/element/E) if(istype(E, /datum/element/embed)) Detach(weapon) @@ -169,46 +169,35 @@ * it to call tryForceEmbed() on its own embed element (it's out of our hands here, our projectile is done), where it will run through all the checks it needs to. */ /datum/element/embed/proc/checkEmbedProjectile(obj/item/projectile/P, atom/movable/firer, atom/hit, angle, hit_zone) - if(!iscarbon(hit) && !isclosedturf(hit)) + if(!iscarbon(hit)) Detach(P) return // we don't care var/obj/item/payload = new payload_type(get_turf(hit)) - var/did_embed - if(iscarbon(hit)) - var/mob/living/carbon/C = hit - var/obj/item/bodypart/limb - limb = C.get_bodypart(hit_zone) - if(!limb) - limb = C.get_bodypart() - did_embed = payload.tryEmbed(limb) - else - did_embed = payload.tryEmbed(hit) + if(istype(payload, /obj/item/shrapnel/bullet)) + payload.name = P.name + payload.embedding = P.embedding + payload.updateEmbedding() + var/mob/living/carbon/C = hit + var/obj/item/bodypart/limb = C.get_bodypart(hit_zone) + if(!limb) + limb = C.get_bodypart() - if(!did_embed) - payload.failedEmbed() + payload.tryEmbed(limb) Detach(P) /** - * tryForceEmbed() is called here when we fire COMSIG_EMBED_TRY_FORCE from [/obj/item/proc/tryEmbed]. Mostly, this means we're a piece of shrapnel from a projectile that just impacted something, and we're trying to embed in it. - * - * The reason for this extra mucking about is avoiding having to do an extra hitby(), and annoying the target by impacting them once with the projectile, then again with the shrapnel (which likely represents said bullet), and possibly - * AGAIN if we actually embed. This way, we save on at least one message. Runs the standard embed checks on the mob/turf. - * * Arguments: - * * I- what we're trying to embed, obviously - * * target- what we're trying to shish-kabob, either a bodypart, a carbon, or a closed turf + * * I- the item we're trying to insert into the target + * * target- what we're trying to shish-kabob, either a bodypart or a carbon * * hit_zone- if our target is a carbon, try to hit them in this zone, if we don't have one, pick a random one. If our target is a bodypart, we already know where we're hitting. * * forced- if we want this to succeed 100% */ /datum/element/embed/proc/tryForceEmbed(obj/item/I, atom/target, hit_zone, forced=FALSE) var/obj/item/bodypart/limb var/mob/living/carbon/C - var/turf/closed/T - if(!forced && !prob(embed_chance)) return - if(iscarbon(target)) C = target if(!hit_zone) @@ -218,10 +207,5 @@ limb = target hit_zone = limb.body_zone C = limb.owner - else if(isclosedturf(target)) - T = target - - if(C) - return checkEmbedMob(I, C, hit_zone, forced=TRUE) - else if(T) - return checkEmbedOther(I, T, forced=TRUE) + checkEmbedMob(I, C, hit_zone, forced=TRUE) + return TRUE diff --git a/code/datums/elements/photosynthesis.dm b/code/datums/elements/photosynthesis.dm index 93e4369b8b..4fe0615b1f 100644 --- a/code/datums/elements/photosynthesis.dm +++ b/code/datums/elements/photosynthesis.dm @@ -60,7 +60,7 @@ if(L.stat == DEAD) continue if(light_nutrition_gain) - L.adjust_nutrition(light_amount * light_nutrition_gain * attached_atoms[AM], NUTRITION_LEVEL_FULL) + L.adjust_nutrition(light_amount * light_nutrition_gain * attached_atoms[AM], NUTRITION_LEVEL_WELL_FED) if(light_amount > bonus_lum || light_amount < malus_lum) var/mult = ((light_amount > bonus_lum) ? 1 : -1) * attached_atoms[AM] if(light_bruteheal) diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm index dc32902e5e..dc9569a4d5 100644 --- a/code/datums/explosion.dm +++ b/code/datums/explosion.dm @@ -196,14 +196,12 @@ GLOBAL_LIST_EMPTY(explosions) //------- EX_ACT AND TURF FIRES ------- - if(T == epicenter) // Ensures explosives detonating from bags trigger other explosives in that bag - var/list/items = list() - for(var/I in T) - var/atom/A = I - if (!(A.flags_1 & PREVENT_CONTENTS_EXPLOSION_1)) //The atom/contents_explosion() proc returns null if the contents ex_acting has been handled by the atom, and TRUE if it hasn't. - items += A.GetAllContents() - for(var/O in items) - var/atom/A = O + if((T == epicenter) && !QDELETED(explosion_source) && ismovable(explosion_source) && (get_turf(explosion_source) == T)) // Ensures explosives detonating from bags trigger other explosives in that bag + var/list/atoms = list() + for(var/atom/A in explosion_source.loc) // the ismovableatom check 2 lines above makes sure we don't nuke an /area + atoms += A + for(var/i in atoms) + var/atom/A = i if(!QDELETED(A)) A.ex_act(dist) diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm index 7e6d567cfa..bd9ecaeeaa 100644 --- a/code/datums/mutations/actions.dm +++ b/code/datums/mutations/actions.dm @@ -410,7 +410,7 @@ throw_speed = 4 embedding = list("embedded_pain_multiplier" = 4, "embed_chance" = 100, "embedded_fall_chance" = 0) w_class = WEIGHT_CLASS_SMALL - sharpness = IS_SHARP + sharpness = SHARP_POINTY var/mob/living/carbon/human/fired_by /// if we missed our target var/missed = TRUE diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index bc7b9171a8..5d363124d9 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -27,6 +27,24 @@ target.attack_hulk(owner) return INTERRUPT_UNARMED_ATTACK | NO_AUTO_CLICKDELAY_HANDLING +/** + *Checks damage of a hulk's arm and applies bone wounds as necessary. + * + *Called by specific atoms being attacked, such as walls. If an atom + *does not call this proc, than punching that atom will not cause + *arm breaking (even if the atom deals recoil damage to hulks). + *Arguments: + *arg1 is the arm to evaluate damage of and possibly break. + */ +/datum/mutation/human/hulk/proc/break_an_arm(obj/item/bodypart/arm) + switch(arm.brute_dam) + if(45 to 50) + arm.force_wound_upwards(/datum/wound/blunt/critical) + if(41 to 45) + arm.force_wound_upwards(/datum/wound/blunt/severe) + if(35 to 41) + arm.force_wound_upwards(/datum/wound/blunt/moderate) + /datum/mutation/human/hulk/on_life() if(owner.health < 0) on_losing(owner) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 407047410b..ca304773a7 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -448,7 +448,7 @@ var/still_bleeding = FALSE for(var/thing in throat.wounds) var/datum/wound/W = thing - if(W.wound_type == WOUND_LIST_CUT && W.severity > WOUND_SEVERITY_MODERATE) + if(W.wound_type == WOUND_SLASH && W.severity > WOUND_SEVERITY_MODERATE) still_bleeding = TRUE break if(!still_bleeding) diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm index 91440d36de..045b1b257d 100644 --- a/code/datums/status_effects/wound_effects.dm +++ b/code/datums/status_effects/wound_effects.dm @@ -117,8 +117,7 @@ /datum/status_effect/wound/on_creation(mob/living/new_owner, incoming_wound) . = ..() - var/datum/wound/W = incoming_wound - linked_wound = W + linked_wound = incoming_wound linked_limb = linked_wound.limb /datum/status_effect/wound/on_remove() @@ -140,9 +139,9 @@ // bones -/datum/status_effect/wound/bone +/datum/status_effect/wound/blunt -/datum/status_effect/wound/bone/interact_speed_modifier() +/datum/status_effect/wound/blunt/interact_speed_modifier() var/mob/living/carbon/C = owner if(C.get_active_hand() == linked_limb) @@ -151,7 +150,7 @@ return 1 -/datum/status_effect/wound/bone/action_cooldown_mod() +/datum/status_effect/wound/blunt/action_cooldown_mod() var/mob/living/carbon/C = owner if(C.get_active_hand() == linked_limb) @@ -159,24 +158,34 @@ return 1 -/datum/status_effect/wound/bone/moderate +/datum/status_effect/wound/blunt/moderate id = "disjoint" -/datum/status_effect/wound/bone/severe +/datum/status_effect/wound/blunt/severe id = "hairline" -/datum/status_effect/wound/bone/critical +/datum/status_effect/wound/blunt/critical id = "compound" // cuts -/datum/status_effect/wound/cut/moderate +/datum/status_effect/wound/slash/moderate id = "abrasion" -/datum/status_effect/wound/cut/severe +/datum/status_effect/wound/slash/severe id = "laceration" -/datum/status_effect/wound/cut/critical +/datum/status_effect/wound/slash/critical id = "avulsion" +// pierce +/datum/status_effect/wound/pierce/moderate + id = "breakage" + +/datum/status_effect/wound/pierce/severe + id = "puncture" + +/datum/status_effect/wound/pierce/critical + id = "rupture" + // burns /datum/status_effect/wound/burn/moderate id = "seconddeg" diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 87126ae28f..68b5d6f987 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -14,7 +14,7 @@ if(NOBLOOD in H.dna.species.species_traits) //can't lose blood if your species doesn't have any return else - quirk_holder.blood_volume -= 0.275 + quirk_holder.blood_volume -= 0.2 /datum/quirk/depression name = "Depression" @@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms) if("Botanist") heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie) if("Medical Doctor") - heirloom_type = /obj/item/healthanalyzer/advanced + heirloom_type = /obj/item/healthanalyzer if("Paramedic") heirloom_type = /obj/item/lighter if("Station Engineer") @@ -337,10 +337,8 @@ GLOBAL_LIST_EMPTY(family_heirlooms) dumb_thing = FALSE //only once per life if(prob(1)) new/obj/item/reagent_containers/food/snacks/pastatomato(get_turf(H)) //now that's what I call spaghetti code + // small chance to make eye contact with inanimate objects/mindless mobs because of nerves - - - /datum/quirk/social_anxiety/proc/looks_at_floor(datum/source, atom/A) var/mob/living/mind_check = A if(prob(85) || (istype(mind_check) && mind_check.mind)) diff --git a/code/datums/wounds/_scars.dm b/code/datums/wounds/_scars.dm index bfbaab835e..8cd0d8a047 100644 --- a/code/datums/wounds/_scars.dm +++ b/code/datums/wounds/_scars.dm @@ -53,8 +53,12 @@ if(victim) LAZYADD(victim.all_scars, src) - description = pick(W.scarring_descriptions) - precise_location = pick(limb.specific_locations) + if(victim && victim.get_biological_state() == BIO_JUST_BONE) + description = pick(strings(BONE_SCAR_FILE, W.scar_keyword)) || "general disfigurement" + else + description = pick(strings(FLESH_SCAR_FILE, W.scar_keyword)) || "general disfigurement" + + precise_location = pick(strings(SCAR_LOC_FILE, limb.body_zone)) switch(W.severity) if(WOUND_SEVERITY_MODERATE) visibility = 2 @@ -62,6 +66,9 @@ visibility = 3 if(WOUND_SEVERITY_CRITICAL) visibility = 5 + if(WOUND_SEVERITY_LOSS) + visibility = 7 + precise_location = "amputation" /// Used when we finalize a scar from a healing cut /datum/scar/proc/lazy_attach(obj/item/bodypart/BP, datum/wound/W) @@ -71,10 +78,11 @@ LAZYADD(victim.all_scars, src) /// Used to "load" a persistent scar -/datum/scar/proc/load(obj/item/bodypart/BP, description, specific_location, severity=WOUND_SEVERITY_SEVERE) - if(!(BP.body_zone in applicable_zones)) +/datum/scar/proc/load(obj/item/bodypart/BP, version, description, specific_location, severity=WOUND_SEVERITY_SEVERE) + if(!(BP.body_zone in applicable_zones) || !BP.is_organic_limb()) qdel(src) return + limb = BP src.severity = severity LAZYADD(limb.scars, src) @@ -90,6 +98,8 @@ visibility = 3 if(WOUND_SEVERITY_CRITICAL) visibility = 5 + if(WOUND_SEVERITY_LOSS) + visibility = 7 return TRUE /// What will show up in examine_more() if this scar is visible @@ -102,9 +112,12 @@ if(WOUND_SEVERITY_MODERATE) msg = "[msg]" if(WOUND_SEVERITY_SEVERE) - msg = "[msg]" + msg = "[msg]" if(WOUND_SEVERITY_CRITICAL) - msg = "[msg]" + msg = "[msg]" + if(WOUND_SEVERITY_LOSS) + msg = "[victim.p_their(TRUE)] [limb.name] [description]." // different format + msg = "[msg]" return "\t[msg]" /// Whether a scar can currently be seen by the viewer @@ -117,12 +130,12 @@ if(!ishuman(victim) || isobserver(viewer) || victim == viewer) return TRUE - var/mob/living/carbon/human/H = victim + var/mob/living/carbon/human/human_victim = victim if(istype(limb, /obj/item/bodypart/head)) - if((H.wear_mask && (H.wear_mask.flags_inv & HIDEFACE)) || (H.head && (H.head.flags_inv & HIDEFACE))) + if((human_victim.wear_mask && (human_victim.wear_mask.flags_inv & HIDEFACE)) || (human_victim.head && (human_victim.head.flags_inv & HIDEFACE))) return FALSE else if(limb.scars_covered_by_clothes) - var/num_covers = LAZYLEN(H.clothingonpart(limb)) + var/num_covers = LAZYLEN(human_victim.clothingonpart(limb)) if(num_covers + get_dist(viewer, victim) >= visibility) return FALSE @@ -131,4 +144,9 @@ /// Used to format a scar to safe in preferences for persistent scars /datum/scar/proc/format() if(!fake) - return "[limb.body_zone]|[description]|[precise_location]|[severity]" + return "[SCAR_CURRENT_VERSION]|[limb.body_zone]|[description]|[precise_location]|[severity]" + +/// Used to format a scar to safe in preferences for persistent scars +/datum/scar/proc/format_amputated(body_zone) + description = pick(list("is several skintone shades paler than the rest of the body", "is a gruesome patchwork of artificial flesh", "has a large series of attachment scars at the articulation points")) + return "[SCAR_CURRENT_VERSION]|[body_zone]|[description]|amputated|[WOUND_SEVERITY_LOSS]" \ No newline at end of file diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index b1ba49b7ab..29c87b32d4 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -33,15 +33,13 @@ /// Either WOUND_SEVERITY_TRIVIAL (meme wounds like stubbed toe), WOUND_SEVERITY_MODERATE, WOUND_SEVERITY_SEVERE, or WOUND_SEVERITY_CRITICAL (or maybe WOUND_SEVERITY_LOSS) var/severity = WOUND_SEVERITY_MODERATE - /// The list of wounds it belongs in, WOUND_LIST_BONE, WOUND_LIST_CUT, or WOUND_LIST_BURN + /// The list of wounds it belongs in, WOUND_LIST_BLUNT, WOUND_LIST_SLASH, or WOUND_LIST_BURN var/wound_type /// What body zones can we affect var/list/viable_zones = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) /// Who owns the body part that we're wounding var/mob/living/carbon/victim = null - /// If we only work on organics (everything right now) - var/organic_only = TRUE /// The bodypart we're parented to var/obj/item/bodypart/limb = null @@ -51,8 +49,6 @@ var/list/treatable_by_grabbed /// Tools with the specified tool flag will also be able to try directly treating this wound var/treatable_tool - /// Set to TRUE if we don't give a shit about the patient's comfort and are allowed to just use any random sharp thing on this wound. Will require an aggressive grab or more to perform - var/treatable_sharp /// How long it will take to treat this wound with a standard effective tool, assuming it doesn't need surgery var/base_treat_time = 5 SECONDS @@ -65,17 +61,13 @@ /// How much we're contributing to this limb's bleed_rate var/blood_flow - /// The minimum we need to roll on [/obj/item/bodypart/proc/check_wounding()] to begin suffering this wound, see check_wounding_mods() for more + /// The minimum we need to roll on [/obj/item/bodypart/proc/check_wounding] to begin suffering this wound, see check_wounding_mods() for more var/threshold_minimum /// How much having this wound will add to all future check_wounding() rolls on this limb, to allow progression to worse injuries with repeated damage var/threshold_penalty /// If we need to process each life tick var/processes = FALSE - /// If TRUE and an item that can treat multiple different types of coexisting wounds (gauze can be used to splint broken bones, staunch bleeding, and cover burns), we get first dibs if we come up first for it, then become nonpriority. - /// Otherwise, if no untreated wound claims the item, we cycle through the non priority wounds and pick a random one who can use that item. - var/treat_priority = FALSE - /// If having this wound makes currently makes the parent bodypart unusable var/disabling @@ -89,12 +81,15 @@ var/cryo_progress /// What kind of scars this wound will create description wise once healed - var/list/scarring_descriptions = list("general disfigurement") + var/scar_keyword = "generic" /// If we've already tried scarring while removing (since remove_wound calls qdel, and qdel calls remove wound, .....) TODO: make this cleaner var/already_scarred = FALSE /// If we forced this wound through badmin smite, we won't count it towards the round totals var/from_smite + /// What flags apply to this wound + var/wound_flags = (FLESH_WOUND | BONE_WOUND | ACCEPTS_GAUZE) + /datum/wound/Destroy() if(attached_surgery) QDEL_NULL(attached_surgery) @@ -115,13 +110,13 @@ * * smited- If this is a smite, we don't care about this wound for stat tracking purposes (not yet implemented) */ /datum/wound/proc/apply_wound(obj/item/bodypart/L, silent = FALSE, datum/wound/old_wound = null, smited = FALSE) - if(!istype(L) || !L.owner || !(L.body_zone in viable_zones) || isalien(L.owner)) + if(!istype(L) || !L.owner || !(L.body_zone in viable_zones) || isalien(L.owner) || !L.is_organic_limb()) qdel(src) return if(ishuman(L.owner)) var/mob/living/carbon/human/H = L.owner - if(organic_only && ((NOBLOOD in H.dna.species.species_traits) || !L.is_organic_limb())) + if(((wound_flags & BONE_WOUND) && !(HAS_BONE in H.dna.species.species_traits)) || ((wound_flags & FLESH_WOUND) && !(HAS_FLESH in H.dna.species.species_traits))) qdel(src) return @@ -161,7 +156,7 @@ victim.visible_message(msg, "Your [limb.name] [occur_text]!", vision_distance = vis_dist) if(sound_effect) - playsound(L.owner, sound_effect, 60 + 20 * severity, TRUE) + playsound(L.owner, sound_effect, 70 + 20 * severity, TRUE) if(!demoted) wound_injury(old_wound) @@ -181,7 +176,7 @@ SEND_SIGNAL(victim, COMSIG_CARBON_LOSE_WOUND, src, limb) if(limb && !ignore_limb) LAZYREMOVE(limb.wounds, src) - limb.update_wounds() + limb.update_wounds(replaced) /** * replace_wound() is used when you want to replace the current wound with a new wound, presumably of the same category, just of a different severity (either up or down counts) @@ -189,7 +184,7 @@ * This proc actually instantiates the new wound based off the specific type path passed, then returns the new instantiated wound datum. * * Arguments: - * * new_type- The TYPE PATH of the wound you want to replace this, like /datum/wound/brute/cut/severe + * * new_type- The TYPE PATH of the wound you want to replace this, like /datum/wound/slash/severe * * smited- If this is a smite, we don't care about this wound for stat tracking purposes (not yet implemented) */ /datum/wound/proc/replace_wound(new_type, smited = FALSE) @@ -206,7 +201,6 @@ /// Additional beneficial effects when the wound is gained, in case you want to give a temporary boost to allow the victim to try an escape or last stand /datum/wound/proc/second_wind() - switch(severity) if(WOUND_SEVERITY_MODERATE) victim.reagents.add_reagent(/datum/reagent/determination, WOUND_DETERMINATION_MODERATE) @@ -214,11 +208,13 @@ victim.reagents.add_reagent(/datum/reagent/determination, WOUND_DETERMINATION_SEVERE) if(WOUND_SEVERITY_CRITICAL) victim.reagents.add_reagent(/datum/reagent/determination, WOUND_DETERMINATION_CRITICAL) + if(WOUND_SEVERITY_LOSS) + victim.reagents.add_reagent(/datum/reagent/determination, WOUND_DETERMINATION_LOSS) /** - * try_treating() is an intercept run from [/mob/living/carbon/attackby()] right after surgeries but before anything else. Return TRUE here if the item is something that is relevant to treatment to take over the interaction. + * try_treating() is an intercept run from [/mob/living/carbon/proc/attackby] right after surgeries but before anything else. Return TRUE here if the item is something that is relevant to treatment to take over the interaction. * - * This proc leads into [/datum/wound/proc/treat()] and probably shouldn't be added onto in children types. You can specify what items or tools you want to be intercepted + * This proc leads into [/datum/wound/proc/treat] and probably shouldn't be added onto in children types. You can specify what items or tools you want to be intercepted * with var/list/treatable_by and var/treatable_tool, then if an item fulfills one of those requirements and our wound claims it first, it goes over to treat() and treat_self(). * * Arguments: @@ -258,7 +254,7 @@ treat(I, user) return TRUE -/// Return TRUE if we have an item that can only be used while aggro grabbed (unhanded aggro grab treatments go in [/datum/wound/proc/try_handling()]). Treatment is still is handled in [/datum/wound/proc/treat()] +/// Return TRUE if we have an item that can only be used while aggro grabbed (unhanded aggro grab treatments go in [/datum/wound/proc/try_handling]). Treatment is still is handled in [/datum/wound/proc/treat] /datum/wound/proc/check_grab_treatments(obj/item/I, mob/user) return FALSE @@ -288,10 +284,22 @@ if(cryo_progress > 33 * severity) qdel(src) +/// When synthflesh is applied to the victim, we call this. No sense in setting up an entire chem reaction system for wounds when we only care for a few chems. Probably will change in the future +/datum/wound/proc/on_synthflesh(power) + return + +/// Called when the patient is undergoing stasis, so that having fully treated a wound doesn't make you sit there helplessly until you think to unbuckle them +/datum/wound/proc/on_stasis() + return + /// Called when we're crushed in an airlock or firedoor, for one of the improvised joint dislocation fixes /datum/wound/proc/crush() return +/// Used when we're being dragged while bleeding, the value we return is how much bloodloss this wound causes from being dragged. Since it's a proc, you can let bandages soak some of the blood +/datum/wound/proc/drag_bleed_amount() + return + /** * get_examine_description() is used in carbon/examine and human/examine to show the status of this wound. Useful if you need to show some status like the wound being splinted or bandaged. * @@ -301,7 +309,8 @@ * * mob/user: The user examining the wound's owner, if that matters */ /datum/wound/proc/get_examine_description(mob/user) - return "[victim.p_their(TRUE)] [limb.name] [examine_desc]!" + . = "[victim.p_their(TRUE)] [limb.name] [examine_desc]" + . = severity <= WOUND_SEVERITY_MODERATE ? "[.]." : "[.]!" /datum/wound/proc/get_scanner_description(mob/user) return "Type: [name]\nSeverity: [severity_text()]\nDescription: [desc]\nRecommended Treatment: [treat_text]" diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index 80d922cba3..128c860a6d 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -1,4 +1,3 @@ - /* Bones */ @@ -7,12 +6,10 @@ /* Base definition */ -/datum/wound/brute/bone - sound_effect = 'sound/effects/crack1.ogg' - wound_type = WOUND_LIST_BONE - - /// The item we're currently splinted with, if there is one - var/obj/item/stack/splinted +/datum/wound/blunt + sound_effect = 'sound/effects/wounds/crack1.ogg' + wound_type = WOUND_BLUNT + wound_flags = (BONE_WOUND | ACCEPTS_GAUZE) /// Have we been taped? var/taped @@ -31,12 +28,12 @@ /// How long do we wait +/- 20% for the next trauma? var/trauma_cycle_cooldown /// If this is a chest wound and this is set, we have this chance to cough up blood when hit in the chest - var/chance_internal_bleeding = 0 + var/internal_bleeding_chance = 0 /* Overwriting of base procs */ -/datum/wound/brute/bone/wound_injury(datum/wound/old_wound = null) +/datum/wound/blunt/wound_injury(datum/wound/old_wound = null) if(limb.body_zone == BODY_ZONE_HEAD && brain_trauma_group) processes = TRUE active_trauma = victim.gain_trauma_type(brain_trauma_group, TRAUMA_RESILIENCE_WOUND) @@ -53,14 +50,14 @@ update_inefficiencies() -/datum/wound/brute/bone/remove_wound(ignore_limb, replaced) +/datum/wound/blunt/remove_wound(ignore_limb, replaced) limp_slowdown = 0 QDEL_NULL(active_trauma) if(victim) UnregisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK) return ..() -/datum/wound/brute/bone/handle_process() +/datum/wound/blunt/handle_process() . = ..() if(limb.body_zone == BODY_ZONE_HEAD && brain_trauma_group && world.time > next_trauma_cycle) if(active_trauma) @@ -86,7 +83,7 @@ remove_wound() /// If we're a human who's punching something with a broken arm, we might hurt ourselves doing so -/datum/wound/brute/bone/proc/attack_with_hurt_hand(mob/M, atom/target, proximity) +/datum/wound/blunt/proc/attack_with_hurt_hand(mob/M, atom/target, proximity) if(victim.get_active_hand() != limb || victim.a_intent == INTENT_HELP || !ismob(target) || severity <= WOUND_SEVERITY_MODERATE) return @@ -104,61 +101,54 @@ limb.receive_damage(brute=rand(3,7)) return COMPONENT_NO_ATTACK_HAND -/datum/wound/brute/bone/receive_damage(wounding_type, wounding_dmg, wound_bonus) - if(!victim) +/datum/wound/blunt/receive_damage(wounding_type, wounding_dmg, wound_bonus) + if(!victim || wounding_dmg < WOUND_MINIMUM_DAMAGE) return + if(ishuman(victim)) + var/mob/living/carbon/human/human_victim = victim + if(NOBLOOD in human_victim.dna?.species.species_traits) + return - if(limb.body_zone == BODY_ZONE_CHEST && victim.blood_volume && prob(chance_internal_bleeding + wounding_dmg)) + if(limb.body_zone == BODY_ZONE_CHEST && victim.blood_volume && prob(internal_bleeding_chance + wounding_dmg)) var/blood_bled = rand(1, wounding_dmg * (severity == WOUND_SEVERITY_CRITICAL ? 2 : 1.5)) // 12 brute toolbox can cause up to 18/24 bleeding with a severe/critical chest wound switch(blood_bled) if(1 to 6) victim.bleed(blood_bled, TRUE) if(7 to 13) - victim.visible_message("[victim] coughs up a bit of blood from the blow to [victim.p_their()] chest.", "You cough up a bit of blood from the blow to your chest.") + victim.visible_message("[victim] coughs up a bit of blood from the blow to [victim.p_their()] chest.", "You cough up a bit of blood from the blow to your chest.", vision_distance=COMBAT_MESSAGE_RANGE) victim.bleed(blood_bled, TRUE) if(14 to 19) - victim.visible_message("[victim] spits out a string of blood from the blow to [victim.p_their()] chest!", "You spit out a string of blood from the blow to your chest!") + victim.visible_message("[victim] spits out a string of blood from the blow to [victim.p_their()] chest!", "You spit out a string of blood from the blow to your chest!", vision_distance=COMBAT_MESSAGE_RANGE) new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) victim.bleed(blood_bled) if(20 to INFINITY) - victim.visible_message("[victim] chokes up a spray of blood from the blow to [victim.p_their()] chest!", "You choke up on a spray of blood from the blow to your chest!") + victim.visible_message("[victim] chokes up a spray of blood from the blow to [victim.p_their()] chest!", "You choke up on a spray of blood from the blow to your chest!", vision_distance=COMBAT_MESSAGE_RANGE) victim.bleed(blood_bled) new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) victim.add_splatter_floor(get_step(victim.loc, victim.dir)) - if(!(wounding_type in list(WOUND_SHARP, WOUND_BURN)) || !splinted || wound_bonus == CANT_WOUND) - return - splinted.take_damage(wounding_dmg, damage_type = (wounding_type == WOUND_SHARP ? BRUTE : BURN), sound_effect = FALSE) - if(QDELETED(splinted)) - var/destroyed_verb = (wounding_type == WOUND_SHARP ? "torn" : "burned") - victim.visible_message("The splint securing [victim]'s [limb.name] is [destroyed_verb] away!", "The splint securing your [limb.name] is [destroyed_verb] away!", vision_distance=COMBAT_MESSAGE_RANGE) - splinted = null - treat_priority = TRUE - update_inefficiencies() - - -/datum/wound/brute/bone/get_examine_description(mob/user) - if(!splinted && !gelled && !taped) +/datum/wound/blunt/get_examine_description(mob/user) + if(!limb.current_gauze && !gelled && !taped) return ..() - var/msg = "" - if(!splinted) - msg = "[victim.p_their(TRUE)] [limb.name] [examine_desc]" + var/list/msg = list() + if(!limb.current_gauze) + msg += "[victim.p_their(TRUE)] [limb.name] [examine_desc]" else - var/splint_condition = "" + var/sling_condition = "" // how much life we have left in these bandages - switch(splinted.obj_integrity / splinted.max_integrity * 100) + switch(limb.current_gauze.obj_integrity / limb.current_gauze.max_integrity * 100) if(0 to 25) - splint_condition = "just barely " + sling_condition = "just barely " if(25 to 50) - splint_condition = "loosely " + sling_condition = "loosely " if(50 to 75) - splint_condition = "mostly " + sling_condition = "mostly " if(75 to INFINITY) - splint_condition = "tightly " + sling_condition = "tightly " - msg = "[victim.p_their(TRUE)] [limb.name] is [splint_condition] fastened in a splint of [splinted.name]" + msg += "[victim.p_their(TRUE)] [limb.name] is [sling_condition] fastened in a sling of [limb.current_gauze.name]" if(taped) msg += ", and appears to be reforming itself under some surgical tape!" @@ -166,58 +156,35 @@ msg += ", with fizzing flecks of blue bone gel sparking off the bone!" else msg += "!" - return "[msg]" + return "[msg.Join()]" /* - New common procs for /datum/wound/brute/bone/ + New common procs for /datum/wound/blunt/ */ -/datum/wound/brute/bone/proc/update_inefficiencies() +/datum/wound/blunt/proc/update_inefficiencies() if(limb.body_zone in list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) - if(splinted) - limp_slowdown = initial(limp_slowdown) * splinted.splint_factor + if(limb.current_gauze) + limp_slowdown = initial(limp_slowdown) * limb.current_gauze.splint_factor else limp_slowdown = initial(limp_slowdown) victim.apply_status_effect(STATUS_EFFECT_LIMP) else if(limb.body_zone in list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) - if(splinted) - interaction_efficiency_penalty = 1 + ((interaction_efficiency_penalty - 1) * splinted.splint_factor) + if(limb.current_gauze) + interaction_efficiency_penalty = 1 + ((interaction_efficiency_penalty - 1) * limb.current_gauze.splint_factor) else interaction_efficiency_penalty = interaction_efficiency_penalty - if(initial(disabling) && splinted) - disabling = FALSE - else if(initial(disabling)) - disabling = TRUE + if(initial(disabling)) + disabling = !limb.current_gauze limb.update_wounds() -/* - BEWARE OF REDUNDANCY AHEAD THAT I MUST PARE DOWN -*/ - -/datum/wound/brute/bone/proc/splint(obj/item/stack/I, mob/user) - if(splinted && splinted.splint_factor >= I.splint_factor) - to_chat(user, "The splint already on [user == victim ? "your" : "[victim]'s"] [limb.name] is better than you can do with [I].") - return - - user.visible_message("[user] begins splinting [victim]'s [limb.name] with [I].", "You begin splinting [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") - - if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) - return - - user.visible_message("[user] finishes splinting [victim]'s [limb.name]!", "You finish splinting [user == victim ? "your" : "[victim]'s"] [limb.name]!") - treat_priority = FALSE - splinted = new I.type(limb) - splinted.amount = 1 - I.use(1) - update_inefficiencies() - /* Moderate (Joint Dislocation) */ -/datum/wound/brute/bone/moderate +/datum/wound/blunt/moderate name = "Joint Dislocation" desc = "Patient's bone has been unset from socket, causing pain and reduced motor function." treat_text = "Recommended application of bonesetter to affected limb, though manual relocation by applying an aggressive grab to the patient and helpfully interacting with afflicted limb may suffice." @@ -226,19 +193,20 @@ severity = WOUND_SEVERITY_MODERATE viable_zones = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) interaction_efficiency_penalty = 1.5 - limp_slowdown = 3 - threshold_minimum = 35 + limp_slowdown = 1.5 + threshold_minimum = 45 threshold_penalty = 15 treatable_tool = TOOL_BONESET - status_effect_type = /datum/status_effect/wound/bone/moderate - scarring_descriptions = list("light discoloring", "a slight blue tint") + wound_flags = (BONE_WOUND) + status_effect_type = /datum/status_effect/wound/blunt/moderate + scar_keyword = "bluntmoderate" -/datum/wound/brute/bone/moderate/crush() +/datum/wound/blunt/moderate/crush() if(prob(33)) victim.visible_message("[victim]'s dislocated [limb.name] pops back into place!", "Your dislocated [limb.name] pops back into place! Ow!") remove_wound() -/datum/wound/brute/bone/moderate/try_handling(mob/living/carbon/human/user) +/datum/wound/blunt/moderate/try_handling(mob/living/carbon/human/user) if(user.pulling != victim || user.zone_selected != limb.body_zone || user.a_intent == INTENT_GRAB) return FALSE @@ -256,7 +224,7 @@ return TRUE /// If someone is snapping our dislocated joint back into place by hand with an aggro grab and help intent -/datum/wound/brute/bone/moderate/proc/chiropractice(mob/living/carbon/human/user) +/datum/wound/blunt/moderate/proc/chiropractice(mob/living/carbon/human/user) var/time = base_treat_time if(!do_after(user, time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) @@ -275,7 +243,7 @@ chiropractice(user) /// If someone is snapping our dislocated joint into a fracture by hand with an aggro grab and harm or disarm intent -/datum/wound/brute/bone/moderate/proc/malpractice(mob/living/carbon/human/user) +/datum/wound/blunt/moderate/proc/malpractice(mob/living/carbon/human/user) var/time = base_treat_time if(!do_after(user, time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) @@ -293,7 +261,7 @@ malpractice(user) -/datum/wound/brute/bone/moderate/treat(obj/item/I, mob/user) +/datum/wound/blunt/moderate/treat(obj/item/I, mob/user) if(victim == user) victim.visible_message("[user] begins resetting [victim.p_their()] [limb.name] with [I].", "You begin resetting your [limb.name] with [I]...") else @@ -317,56 +285,57 @@ Severe (Hairline Fracture) */ -/datum/wound/brute/bone/severe +/datum/wound/blunt/severe name = "Hairline Fracture" desc = "Patient's bone has suffered a crack in the foundation, causing serious pain and reduced limb functionality." - treat_text = "Recommended light surgical application of bone gel, though splinting will prevent worsening situation." - examine_desc = "appears bruised and grotesquely swollen" - + treat_text = "Recommended light surgical application of bone gel, though a sling of medical gauze will prevent worsening situation." + examine_desc = "appears grotesquely swollen, its attachment weakened" occur_text = "sprays chips of bone and develops a nasty looking bruise" + severity = WOUND_SEVERITY_SEVERE interaction_efficiency_penalty = 2 - limp_slowdown = 6 - threshold_minimum = 60 + limp_slowdown = 4 + threshold_minimum = 70 threshold_penalty = 30 - treatable_by = list(/obj/item/stack/sticky_tape/surgical, /obj/item/stack/medical/gauze, /obj/item/stack/medical/bone_gel) - status_effect_type = /datum/status_effect/wound/bone/severe - treat_priority = TRUE - scarring_descriptions = list("a faded, fist-sized bruise", "a vaguely triangular peel scar") + treatable_by = list(/obj/item/stack/sticky_tape/surgical, /obj/item/stack/medical/bone_gel) + status_effect_type = /datum/status_effect/wound/blunt/severe + scar_keyword = "bluntsevere" brain_trauma_group = BRAIN_TRAUMA_MILD trauma_cycle_cooldown = 1.5 MINUTES - chance_internal_bleeding = 40 + internal_bleeding_chance = 40 + wound_flags = (BONE_WOUND | ACCEPTS_GAUZE | MANGLES_BONE) -/datum/wound/brute/bone/critical +/datum/wound/blunt/critical name = "Compound Fracture" desc = "Patient's bones have suffered multiple gruesome fractures, causing significant pain and near uselessness of limb." treat_text = "Immediate binding of affected limb, followed by surgical intervention ASAP." - examine_desc = "has a cracked bone sticking out of it" + examine_desc = "is mangled and pulped, seemingly held together by tissue alone" occur_text = "cracks apart, exposing broken bones to open air" + severity = WOUND_SEVERITY_CRITICAL interaction_efficiency_penalty = 4 - limp_slowdown = 9 - sound_effect = 'sound/effects/crack2.ogg' - threshold_minimum = 115 + limp_slowdown = 6 + sound_effect = 'sound/effects/wounds/crack2.ogg' + threshold_minimum = 125 threshold_penalty = 50 disabling = TRUE - treatable_by = list(/obj/item/stack/sticky_tape/surgical, /obj/item/stack/medical/gauze, /obj/item/stack/medical/bone_gel) - status_effect_type = /datum/status_effect/wound/bone/critical - treat_priority = TRUE - scarring_descriptions = list("a section of janky skin lines and badly healed scars", "a large patch of uneven skin tone", "a cluster of calluses") + treatable_by = list(/obj/item/stack/sticky_tape/surgical, /obj/item/stack/medical/bone_gel) + status_effect_type = /datum/status_effect/wound/blunt/critical + scar_keyword = "bluntcritical" brain_trauma_group = BRAIN_TRAUMA_SEVERE trauma_cycle_cooldown = 2.5 MINUTES - chance_internal_bleeding = 60 + internal_bleeding_chance = 60 + wound_flags = (BONE_WOUND | ACCEPTS_GAUZE | MANGLES_BONE) // doesn't make much sense for "a" bone to stick out of your head -/datum/wound/brute/bone/critical/apply_wound(obj/item/bodypart/L, silent, datum/wound/old_wound, smited) +/datum/wound/blunt/critical/apply_wound(obj/item/bodypart/L, silent, datum/wound/old_wound, smited) if(L.body_zone == BODY_ZONE_HEAD) occur_text = "splits open, exposing a bare, cracked skull through the flesh and blood" examine_desc = "has an unsettling indent, with bits of skull poking out" . = ..() /// if someone is using bone gel on our wound -/datum/wound/brute/bone/proc/gel(obj/item/stack/medical/bone_gel/I, mob/user) +/datum/wound/blunt/proc/gel(obj/item/stack/medical/bone_gel/I, mob/user) if(gelled) to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] is already coated with bone gel!") return @@ -385,12 +354,12 @@ var/painkiller_bonus = 0 if(victim.drunkenness) painkiller_bonus += 5 - if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/medicine/morphine)) + if(victim.reagents?.has_reagent(/datum/reagent/medicine/morphine)) painkiller_bonus += 10 - if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/determination)) + if(victim.reagents?.has_reagent(/datum/reagent/determination)) painkiller_bonus += 5 - if(prob(25 + (20 * (severity - 2)) - painkiller_bonus)) // 25%/45% chance to fail self-applying with severe and critical wounds, modded by painkillers + if(prob(25 + (20 * severity - 2) - painkiller_bonus)) // 25%/45% chance to fail self-applying with severe and critical wounds, modded by painkillers victim.visible_message("[victim] fails to finish applying [I] to [victim.p_their()] [limb.name], passing out from the pain!", "You black out from the pain of applying [I] to your [limb.name] before you can finish!") victim.AdjustUnconscious(5 SECONDS) return @@ -401,7 +370,7 @@ gelled = TRUE /// if someone is using surgical tape on our wound -/datum/wound/brute/bone/proc/tape(obj/item/stack/sticky_tape/surgical/I, mob/user) +/datum/wound/blunt/proc/tape(obj/item/stack/sticky_tape/surgical/I, mob/user) if(!gelled) to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] must be coated with bone gel to perform this emergency operation!") return @@ -426,15 +395,13 @@ taped = TRUE processes = TRUE -/datum/wound/brute/bone/treat(obj/item/I, mob/user) +/datum/wound/blunt/treat(obj/item/I, mob/user) if(istype(I, /obj/item/stack/medical/bone_gel)) gel(I, user) else if(istype(I, /obj/item/stack/sticky_tape/surgical)) tape(I, user) - else if(istype(I, /obj/item/stack/medical/gauze)) - splint(I, user) -/datum/wound/brute/bone/get_scanner_description(mob/user) +/datum/wound/blunt/get_scanner_description(mob/user) . = ..() . += "

" @@ -444,7 +411,7 @@ else if(!taped) . += "Continue Alternative Treatment: Apply surgical tape directly to injured limb to begin bone regeneration. Note, this is both excruciatingly painful and slow.\n" else - . += "Note: Bone regeneration in effect. Bone is [round((regen_points_current*100)/regen_points_needed,0.1)]% regenerated.\n" + . += "Note: Bone regeneration in effect. Bone is [round(regen_points_current*100/regen_points_needed)]% regenerated.\n" if(limb.body_zone == BODY_ZONE_HEAD) . += "Cranial Trauma Detected: Patient will suffer random bouts of [severity == WOUND_SEVERITY_SEVERE ? "mild" : "severe"] brain traumas until bone is repaired." diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index 6a6629a0c9..f3e22807cf 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -1,14 +1,14 @@ - // TODO: well, a lot really, but specifically I want to add potential fusing of clothing/equipment on the affected area, and limb infections, though those may go in body part code /datum/wound/burn a_or_from = "from" - wound_type = WOUND_LIST_BURN + wound_type = WOUND_BURN processes = TRUE - sound_effect = 'sound/effects/sizzle1.ogg' + sound_effect = 'sound/effects/wounds/sizzle1.ogg' + wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE) - treatable_by = list(/obj/item/stack/medical/gauze, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh) // sterilizer and alcohol will require reagent treatments, coming soon + treatable_by = list(/obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh) // sterilizer and alcohol will require reagent treatments, coming soon // Flesh damage vars /// How much damage to our flesh we currently have. Once both this and infestation reach 0, the wound is considered healed @@ -27,8 +27,6 @@ /// Once we reach infestation beyond WOUND_INFESTATION_SEPSIS, we get this many warnings before the limb is completely paralyzed (you'd have to ignore a really bad burn for a really long time for this to happen) var/strikes_to_lose_limb = 3 - /// The current bandage we have for this wound (maybe move bandages to the limb?) - var/obj/item/stack/current_bandage /datum/wound/burn/handle_process() . = ..() @@ -47,15 +45,11 @@ sanitization += 0.3 flesh_healing += 0.5 - if(current_bandage) - current_bandage.absorption_capacity -= WOUND_BURN_SANITIZATION_RATE - if(current_bandage.absorption_capacity <= 0) - victim.visible_message("Pus soaks through \the [current_bandage] on [victim]'s [limb.name].", "Pus soaks through \the [current_bandage] on your [limb.name].", vision_distance=COMBAT_MESSAGE_RANGE) - QDEL_NULL(current_bandage) - treat_priority = TRUE + if(limb.current_gauze) + limb.seep_gauze(WOUND_BURN_SANITIZATION_RATE) if(flesh_healing > 0) - var/bandage_factor = (current_bandage ? current_bandage.splint_factor : 1) + var/bandage_factor = (limb.current_gauze ? limb.current_gauze.splint_factor : 1) flesh_damage = max(0, flesh_damage - 1) flesh_healing = max(0, flesh_healing - bandage_factor) // good bandages multiply the length of flesh healing @@ -67,7 +61,7 @@ // sanitization is checked after the clearing check but before the rest, because we freeze the effects of infection while we have sanitization if(sanitization > 0) - var/bandage_factor = (current_bandage ? current_bandage.splint_factor : 1) + var/bandage_factor = (limb.current_gauze ? limb.current_gauze.splint_factor : 1) infestation = max(0, infestation - WOUND_BURN_SANITIZATION_RATE) sanitization = max(0, sanitization - (WOUND_BURN_SANITIZATION_RATE * bandage_factor)) return @@ -122,10 +116,10 @@ if(strikes_to_lose_limb <= 0) return "[victim.p_their(TRUE)] [limb.name] is completely dead and unrecognizable as organic." - var/condition = "" - if(current_bandage) + var/list/condition = list("[victim.p_their(TRUE)] [limb.name] [examine_desc]") + if(limb.current_gauze) var/bandage_condition - switch(current_bandage.absorption_capacity) + switch(limb.current_gauze.absorption_capacity) if(0 to 1.25) bandage_condition = "nearly ruined " if(1.25 to 2.75) @@ -135,7 +129,7 @@ if(4 to INFINITY) bandage_condition = "clean " - condition += " underneath a dressing of [bandage_condition] [current_bandage.name]" + condition += " underneath a dressing of [bandage_condition] [limb.current_gauze.name]" else switch(infestation) if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE) @@ -149,7 +143,7 @@ else condition += "!" - return "[victim.p_their(TRUE)] [limb.name] [examine_desc][condition]" + return "[condition.Join()]" /datum/wound/burn/get_scanner_description(mob/user) if(strikes_to_lose_limb == 0) @@ -186,7 +180,7 @@ /// if someone is using ointment on our burns /datum/wound/burn/proc/ointment(obj/item/stack/medical/ointment/I, mob/user) user.visible_message("[user] begins applying [I] to [victim]'s [limb.name]...", "You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...") - if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), target = victim)) + if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), extra_checks = CALLBACK(src, .proc/still_exists))) return limb.heal_damage(I.heal_brute, I.heal_burn) @@ -200,36 +194,6 @@ else try_treating(I, user) -/// for use in the burn dressing surgery since we don't want to make them do another do_after obviously -/datum/wound/burn/proc/force_bandage(obj/item/stack/medical/gauze/I, mob/user) - QDEL_NULL(current_bandage) - current_bandage = new I.type(limb) - current_bandage.amount = 1 - treat_priority = FALSE - sanitization += I.sanitization - I.use(1) - -/// if someone is wrapping gauze on our burns -/datum/wound/burn/proc/bandage(obj/item/stack/medical/gauze/I, mob/user) - if(current_bandage) - if(current_bandage.absorption_capacity > I.absorption_capacity + 1) - to_chat(user, "The [current_bandage] on [victim]'s [limb.name] is still in better condition than your [I.name]!") - return - user.visible_message("[user] begins to redress the burns on [victim]'s [limb.name] with [I]...", "You begin redressing the burns on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") - else - user.visible_message("[user] begins to dress the burns on [victim]'s [limb.name] with [I]...", "You begin dressing the burns on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") - - if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) - return - - user.visible_message("[user] applies [I] to [victim].", "You apply [I] to [user == victim ? "your" : "[victim]'s"] [limb.name].") - QDEL_NULL(current_bandage) - current_bandage = new I.type(limb) - current_bandage.amount = 1 - treat_priority = FALSE - sanitization += I.sanitization - I.use(1) - /// if someone is using mesh on our burns /datum/wound/burn/proc/mesh(obj/item/stack/medical/mesh/I, mob/user) user.visible_message("[user] begins wrapping [victim]'s [limb.name] with [I]...", "You begin wrapping [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") @@ -249,7 +213,7 @@ /// Paramedic UV penlights /datum/wound/burn/proc/uv(obj/item/flashlight/pen/paramedic/I, mob/user) - if(I.uv_cooldown > world.time) + if(!COOLDOWN_FINISHED(I, uv_cooldown)) to_chat(user, "[I] is still recharging!") return if(infestation <= 0 || infestation < sanitization) @@ -258,20 +222,29 @@ user.visible_message("[user] flashes the burns on [victim]'s [limb] with [I].", "You flash the burns on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I].", vision_distance=COMBAT_MESSAGE_RANGE) sanitization += I.uv_power - I.uv_cooldown = world.time + I.uv_cooldown_length + COOLDOWN_START(I, uv_cooldown, I.uv_cooldown_length) /datum/wound/burn/treat(obj/item/I, mob/user) - if(istype(I, /obj/item/stack/medical/gauze)) - bandage(I, user) - else if(istype(I, /obj/item/stack/medical/ointment)) + if(istype(I, /obj/item/stack/medical/ointment)) ointment(I, user) else if(istype(I, /obj/item/stack/medical/mesh)) mesh(I, user) else if(istype(I, /obj/item/flashlight/pen/paramedic)) uv(I, user) -/// basic support for instabitaluri/synthflesh healing flesh damage, more chem support in the future -/datum/wound/burn/proc/regenerate_flesh(amount) +// people complained about burns not healing on stasis beds, so in addition to checking if it's cured, they also get the special ability to very slowly heal on stasis beds if they have the healing effects stored +/datum/wound/burn/on_stasis() + . = ..() + if(flesh_healing > 0) + flesh_damage = max(0, flesh_damage - 0.2) + if((flesh_damage <= 0) && (infestation <= 1)) + to_chat(victim, "The burns on your [limb.name] have cleared up!") + qdel(src) + return + if(sanitization > 0) + infestation = max(0, infestation - WOUND_BURN_SANITIZATION_RATE * 0.2) + +/datum/wound/burn/on_synthflesh(amount) flesh_healing += amount * 0.5 // 20u patch will heal 10 flesh standard // we don't even care about first degree burns, straight to second @@ -282,12 +255,12 @@ examine_desc = "is badly burned and breaking out in blisters" occur_text = "breaks out with violent red burns" severity = WOUND_SEVERITY_MODERATE - damage_mulitplier_penalty = 1.1 - threshold_minimum = 40 + damage_mulitplier_penalty = 1.05 + threshold_minimum = 50 threshold_penalty = 30 // burns cause significant decrease in limb integrity compared to other wounds status_effect_type = /datum/status_effect/wound/burn/moderate flesh_damage = 5 - scarring_descriptions = list("small amoeba-shaped skinmarks", "a faded streak of depressed skin") + scar_keyword = "burnmoderate" /datum/wound/burn/severe name = "Third Degree Burns" @@ -296,14 +269,14 @@ examine_desc = "appears seriously charred, with aggressive red splotches" occur_text = "chars rapidly, exposing ruined tissue and spreading angry red burns" severity = WOUND_SEVERITY_SEVERE - damage_mulitplier_penalty = 1.2 - threshold_minimum = 80 + damage_mulitplier_penalty = 1.1 + threshold_minimum = 90 threshold_penalty = 40 status_effect_type = /datum/status_effect/wound/burn/severe - treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/gauze, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh) + treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh) infestation_rate = 0.05 // appx 13 minutes to reach sepsis without any treatment flesh_damage = 12.5 - scarring_descriptions = list("a large, jagged patch of faded skin", "random spots of shiny, smooth skin", "spots of taut, leathery skin") + scar_keyword = "burnsevere" /datum/wound/burn/critical name = "Catastrophic Burns" @@ -312,12 +285,12 @@ examine_desc = "is a ruined mess of blanched bone, melted fat, and charred tissue" occur_text = "vaporizes as flesh, bone, and fat melt together in a horrifying mess" severity = WOUND_SEVERITY_CRITICAL - damage_mulitplier_penalty = 1.3 - sound_effect = 'sound/effects/sizzle2.ogg' - threshold_minimum = 140 + damage_mulitplier_penalty = 1.15 + sound_effect = 'sound/effects/wounds/sizzle2.ogg' + threshold_minimum = 150 threshold_penalty = 80 status_effect_type = /datum/status_effect/wound/burn/critical - treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/gauze, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh) + treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh) infestation_rate = 0.15 // appx 4.33 minutes to reach sepsis without any treatment flesh_damage = 20 - scarring_descriptions = list("massive, disfiguring keloid scars", "several long streaks of badly discolored and malformed skin", "unmistakeable splotches of dead tissue from serious burns") + scar_keyword = "burncritical" diff --git a/code/datums/wounds/loss.dm b/code/datums/wounds/loss.dm new file mode 100644 index 0000000000..6c5e536fb2 --- /dev/null +++ b/code/datums/wounds/loss.dm @@ -0,0 +1,41 @@ +/datum/wound/loss + name = "Dismembered" + desc = "oof ouch!!" + + sound_effect = 'sound/effects/dismember.ogg' + severity = WOUND_SEVERITY_LOSS + threshold_minimum = 180 + status_effect_type = null + scar_keyword = "dismember" + wound_flags = null + +/// Our special proc for our special dismembering, the wounding type only matters for what text we have +/datum/wound/loss/proc/apply_dismember(obj/item/bodypart/dismembered_part, wounding_type=WOUND_SLASH) + if(!istype(dismembered_part) || !dismembered_part.owner || !(dismembered_part.body_zone in viable_zones) || isalien(dismembered_part.owner) || !dismembered_part.can_dismember()) + qdel(src) + return + + already_scarred = TRUE // so we don't scar a limb we don't have. If I add different levels of amputation desc, do it here + + switch(wounding_type) + if(WOUND_BLUNT) + occur_text = "is shattered through the last bone holding it together, severing it completely!" + if(WOUND_SLASH) + occur_text = "is slashed through the last tissue holding it together, severing it completely!" + if(WOUND_PIERCE) + occur_text = "is pierced through the last tissue holding it together, severing it completely!" + if(WOUND_BURN) + occur_text = "is completely incinerated, falling to dust!" + + victim = dismembered_part.owner + + var/msg = "[victim]'s [dismembered_part.name] [occur_text]!" + + victim.visible_message(msg, "Your [dismembered_part.name] [occur_text]!") + + limb = dismembered_part + severity = WOUND_SEVERITY_LOSS + second_wind() + log_wound(victim, src) + dismembered_part.dismember(wounding_type == WOUND_BURN ? BURN : BRUTE) + qdel(src) diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm new file mode 100644 index 0000000000..56c60b31d7 --- /dev/null +++ b/code/datums/wounds/pierce.dm @@ -0,0 +1,170 @@ +/* + Pierce +*/ + +/datum/wound/pierce + sound_effect = 'sound/weapons/slice.ogg' + processes = TRUE + wound_type = WOUND_PIERCE + treatable_by = list(/obj/item/stack/medical/suture) + treatable_tool = TOOL_CAUTERY + base_treat_time = 3 SECONDS + wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE) + + /// How much blood we start losing when this wound is first applied + var/initial_flow + /// If gauzed, what percent of the internal bleeding actually clots of the total absorption rate + var/gauzed_clot_rate + + /// When hit on this bodypart, we have this chance of losing some blood + the incoming damage + var/internal_bleeding_chance + /// If we let off blood when hit, the max blood lost is this * the incoming damage + var/internal_bleeding_coefficient + +/datum/wound/pierce/wound_injury(datum/wound/old_wound) + blood_flow = initial_flow + +/datum/wound/pierce/receive_damage(wounding_type, wounding_dmg, wound_bonus) + if(victim.stat == DEAD || wounding_dmg < 5) + return + if(victim.blood_volume && prob(internal_bleeding_chance + wounding_dmg)) + if(limb.current_gauze && limb.current_gauze.splint_factor) + wounding_dmg *= (1 - limb.current_gauze.splint_factor) + var/blood_bled = rand(1, wounding_dmg * internal_bleeding_coefficient) // 12 brute toolbox can cause up to 15/18/21 bloodloss on mod/sev/crit + switch(blood_bled) + if(1 to 6) + victim.bleed(blood_bled, TRUE) + if(7 to 13) + victim.visible_message("Blood droplets fly from the hole in [victim]'s [limb.name].", "You cough up a bit of blood from the blow to your [limb.name].", vision_distance=COMBAT_MESSAGE_RANGE) + victim.bleed(blood_bled, TRUE) + if(14 to 19) + victim.visible_message("A small stream of blood spurts from the hole in [victim]'s [limb.name]!", "You spit out a string of blood from the blow to your [limb.name]!", vision_distance=COMBAT_MESSAGE_RANGE) + new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) + victim.bleed(blood_bled) + if(20 to INFINITY) + victim.visible_message("A spray of blood streams from the gash in [victim]'s [limb.name]!", "You choke up on a spray of blood from the blow to your [limb.name]!", vision_distance=COMBAT_MESSAGE_RANGE) + victim.bleed(blood_bled) + new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) + victim.add_splatter_floor(get_step(victim.loc, victim.dir)) + +/datum/wound/pierce/handle_process() + blood_flow = min(blood_flow, WOUND_SLASH_MAX_BLOODFLOW) + + if(victim.bodytemperature < (BODYTEMP_NORMAL - 10)) + blood_flow -= 0.2 + if(prob(5)) + to_chat(victim, "You feel the [lowertext(name)] in your [limb.name] firming up from the cold!") + + if(victim.reagents?.has_reagent(/datum/reagent/toxin/heparin)) + blood_flow += 0.5 // old herapin used to just add +2 bleed stacks per tick, this adds 0.5 bleed flow to all open cuts which is probably even stronger as long as you can cut them first + + if(limb.current_gauze) + blood_flow -= limb.current_gauze.absorption_rate * gauzed_clot_rate + limb.current_gauze.absorption_capacity -= limb.current_gauze.absorption_rate + + if(blood_flow <= 0) + qdel(src) + +/datum/wound/pierce/on_stasis() + . = ..() + if(blood_flow <= 0) + qdel(src) + +/datum/wound/pierce/treat(obj/item/I, mob/user) + if(istype(I, /obj/item/stack/medical/suture)) + suture(I, user) + else if(I.tool_behaviour == TOOL_CAUTERY || I.get_temperature() > 300) + tool_cauterize(I, user) + +/datum/wound/pierce/on_xadone(power) + . = ..() + blood_flow -= 0.03 * power // i think it's like a minimum of 3 power, so .09 blood_flow reduction per tick is pretty good for 0 effort + +/datum/wound/pierce/on_synthflesh(power) + . = ..() + blood_flow -= 0.05 * power // 20u * 0.05 = -1 blood flow, less than with slashes but still good considering smaller bleed rates + +/// If someone is using a suture to close this cut +/datum/wound/pierce/proc/suture(obj/item/stack/medical/suture/I, mob/user) + var/self_penalty_mult = (user == victim ? 1.4 : 1) + user.visible_message("[user] begins stitching [victim]'s [limb.name] with [I]...", "You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + return + user.visible_message("[user] stitches up some of the bleeding on [victim].", "You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].") + var/blood_sutured = I.stop_bleeding / self_penalty_mult * 0.5 + blood_flow -= blood_sutured + limb.heal_damage(I.heal_brute, I.heal_burn) + + if(blood_flow > 0) + try_treating(I, user) + else + to_chat(user, "You successfully close the hole in [user == victim ? "your" : "[victim]'s"] [limb.name].") + +/// If someone is using either a cautery tool or something with heat to cauterize this pierce +/datum/wound/pierce/proc/tool_cauterize(obj/item/I, mob/user) + var/self_penalty_mult = (user == victim ? 1.5 : 1) + user.visible_message("[user] begins cauterizing [victim]'s [limb.name] with [I]...", "You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + return + + user.visible_message("[user] cauterizes some of the bleeding on [victim].", "You cauterize some of the bleeding on [victim].") + limb.receive_damage(burn = 2 + severity, wound_bonus = CANT_WOUND) + if(prob(30)) + victim.emote("scream") + var/blood_cauterized = (0.6 / self_penalty_mult) * 0.5 + blood_flow -= blood_cauterized + + if(blood_flow > 0) + try_treating(I, user) + +/datum/wound/pierce/moderate + name = "Minor Breakage" + desc = "Patient's skin has been broken open, causing severe bruising and minor internal bleeding in affected area." + treat_text = "Treat affected site with bandaging or exposure to extreme cold. In dire cases, brief exposure to vacuum may suffice." // space is cold in ss13, so it's like an ice pack! + examine_desc = "has a small, circular hole, gently bleeding" + occur_text = "spurts out a thin stream of blood" + sound_effect = 'sound/effects/wounds/pierce1.ogg' + severity = WOUND_SEVERITY_MODERATE + initial_flow = 1.5 + gauzed_clot_rate = 0.8 + internal_bleeding_chance = 30 + internal_bleeding_coefficient = 1.25 + threshold_minimum = 40 + threshold_penalty = 15 + status_effect_type = /datum/status_effect/wound/pierce/moderate + scar_keyword = "piercemoderate" + +/datum/wound/pierce/severe + name = "Open Puncture" + desc = "Patient's internal tissue is penetrated, causing sizeable internal bleeding and reduced limb stability." + treat_text = "Repair punctures in skin by suture or cautery, extreme cold may also work." + examine_desc = "is pierced clear through, with bits of tissue obscuring the open hole" + occur_text = "looses a violent spray of blood, revealing a pierced wound" + sound_effect = 'sound/effects/wounds/pierce2.ogg' + severity = WOUND_SEVERITY_SEVERE + initial_flow = 2.25 + gauzed_clot_rate = 0.6 + internal_bleeding_chance = 60 + internal_bleeding_coefficient = 1.5 + threshold_minimum = 60 + threshold_penalty = 25 + status_effect_type = /datum/status_effect/wound/pierce/severe + scar_keyword = "piercesevere" + +/datum/wound/pierce/critical + name = "Ruptured Cavity" + desc = "Patient's internal tissue and circulatory system is shredded, causing significant internal bleeding and damage to internal organs." + treat_text = "Surgical repair of puncture wound, followed by supervised resanguination." + examine_desc = "is ripped clear through, barely held together by exposed bone" + occur_text = "blasts apart, sending chunks of viscera flying in all directions" + sound_effect = 'sound/effects/wounds/pierce3.ogg' + severity = WOUND_SEVERITY_CRITICAL + initial_flow = 3 + gauzed_clot_rate = 0.4 + internal_bleeding_chance = 80 + internal_bleeding_coefficient = 1.75 + threshold_minimum = 110 + threshold_penalty = 40 + status_effect_type = /datum/status_effect/wound/pierce/critical + scar_keyword = "piercecritical" + wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | MANGLES_FLESH) diff --git a/code/datums/wounds/cuts.dm b/code/datums/wounds/slash.dm similarity index 60% rename from code/datums/wounds/cuts.dm rename to code/datums/wounds/slash.dm index 59ce286884..5fef49653f 100644 --- a/code/datums/wounds/cuts.dm +++ b/code/datums/wounds/slash.dm @@ -1,17 +1,16 @@ - /* Cuts */ -/datum/wound/brute/cut +/datum/wound/slash sound_effect = 'sound/weapons/slice.ogg' processes = TRUE - wound_type = WOUND_LIST_CUT - treatable_by = list(/obj/item/stack/medical/suture, /obj/item/stack/medical/gauze) + wound_type = WOUND_SLASH + treatable_by = list(/obj/item/stack/medical/suture) treatable_by_grabbed = list(/obj/item/gun/energy/laser) treatable_tool = TOOL_CAUTERY - treat_priority = TRUE base_treat_time = 3 SECONDS + wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE) /// How much blood we start losing when this wound is first applied var/initial_flow @@ -27,75 +26,82 @@ var/max_per_type /// The maximum flow we've had so far var/highest_flow - /// How much flow we've already cauterized - var/cauterized - /// How much flow we've already sutured - var/sutured - /// The current bandage we have for this wound (maybe move bandages to the limb?) - var/obj/item/stack/current_bandage /// A bad system I'm using to track the worst scar we earned (since we can demote, we want the biggest our wound has been, not what it was when it was cured (probably moderate)) var/datum/scar/highest_scar -/datum/wound/brute/cut/wound_injury(datum/wound/brute/cut/old_wound = null) +/datum/wound/slash/wound_injury(datum/wound/slash/old_wound = null) blood_flow = initial_flow if(old_wound) blood_flow = max(old_wound.blood_flow, initial_flow) if(old_wound.severity > severity && old_wound.highest_scar) highest_scar = old_wound.highest_scar old_wound.highest_scar = null - if(old_wound.current_bandage) - current_bandage = old_wound.current_bandage - old_wound.current_bandage = null if(!highest_scar) highest_scar = new highest_scar.generate(limb, src, add_to_scars=FALSE) -/datum/wound/brute/cut/remove_wound(ignore_limb, replaced) +/datum/wound/slash/remove_wound(ignore_limb, replaced) if(!replaced && highest_scar) already_scarred = TRUE highest_scar.lazy_attach(limb) return ..() -/datum/wound/brute/cut/get_examine_description(mob/user) - if(!current_bandage) +/datum/wound/slash/get_examine_description(mob/user) + if(!limb.current_gauze) return ..() - var/bandage_condition = "" + var/list/msg = list("The cuts on [victim.p_their()] [limb.name] are wrapped with") // how much life we have left in these bandages - switch(current_bandage.absorption_capacity) + switch(limb.current_gauze.absorption_capacity) if(0 to 1.25) - bandage_condition = "nearly ruined " + msg += "nearly ruined " if(1.25 to 2.75) - bandage_condition = "badly worn " + msg += "badly worn " if(2.75 to 4) - bandage_condition = "slightly bloodied " + msg += "slightly bloodied " if(4 to INFINITY) - bandage_condition = "clean " - return "The cuts on [victim.p_their()] [limb.name] are wrapped with [bandage_condition] [current_bandage.name]!" + msg += "clean " + msg += "[limb.current_gauze.name]!" -/datum/wound/brute/cut/receive_damage(wounding_type, wounding_dmg, wound_bonus) - if(victim.stat != DEAD && wounding_type == WOUND_SHARP) // can't stab dead bodies to make it bleed faster this way + return "[msg.Join()]" + +/datum/wound/slash/receive_damage(wounding_type, wounding_dmg, wound_bonus) + if(victim.stat != DEAD && wounding_type == WOUND_SLASH) // can't stab dead bodies to make it bleed faster this way blood_flow += 0.05 * wounding_dmg -/datum/wound/brute/cut/handle_process() - blood_flow = min(blood_flow, WOUND_CUT_MAX_BLOODFLOW) +/datum/wound/slash/drag_bleed_amount() + // say we have 3 severe cuts with 3 blood flow each, pretty reasonable + // compare with being at 100 brute damage before, where you bled (brute/100 * 2), = 2 blood per tile + var/bleed_amt = min(blood_flow * 0.1, 1) // 3 * 3 * 0.1 = 0.9 blood total, less than before! the share here is .3 blood of course. - if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/toxin/heparin)) + if(limb.current_gauze) // gauze stops all bleeding from dragging on this limb, but wears the gauze out quicker + limb.seep_gauze(bleed_amt * 0.33) + return + + return bleed_amt + +/datum/wound/slash/handle_process() + if(victim.stat == DEAD) + blood_flow -= max(clot_rate, WOUND_SLASH_DEAD_CLOT_MIN) + if(blood_flow < minimum_flow) + if(demotes_to) + replace_wound(demotes_to) + return + qdel(src) + return + + blood_flow = min(blood_flow, WOUND_SLASH_MAX_BLOODFLOW) + + if(victim.reagents?.has_reagent(/datum/reagent/toxin/heparin)) blood_flow += 0.5 // old herapin used to just add +2 bleed stacks per tick, this adds 0.5 bleed flow to all open cuts which is probably even stronger as long as you can cut them first - else if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/medicine/coagulant)) - blood_flow -= 0.25 - if(current_bandage) + if(limb.current_gauze) if(clot_rate > 0) blood_flow -= clot_rate - blood_flow -= current_bandage.absorption_rate - current_bandage.absorption_capacity -= current_bandage.absorption_rate - if(current_bandage.absorption_capacity < 0) - victim.visible_message("Blood soaks through \the [current_bandage] on [victim]'s [limb.name].", "Blood soaks through \the [current_bandage] on your [limb.name].", vision_distance=COMBAT_MESSAGE_RANGE) - QDEL_NULL(current_bandage) - treat_priority = TRUE + blood_flow -= limb.current_gauze.absorption_rate + limb.seep_gauze(limb.current_gauze.absorption_rate) else blood_flow -= clot_rate @@ -109,41 +115,57 @@ to_chat(victim, "The cut on your [limb.name] has stopped bleeding!") qdel(src) + +/datum/wound/slash/on_stasis() + if(blood_flow >= minimum_flow) + return + if(demotes_to) + replace_wound(demotes_to) + return + qdel(src) + /* BEWARE, THE BELOW NONSENSE IS MADNESS. bones.dm looks more like what I have in mind and is sufficiently clean, don't pay attention to this messiness */ -/datum/wound/brute/cut/check_grab_treatments(obj/item/I, mob/user) +/datum/wound/slash/check_grab_treatments(obj/item/I, mob/user) if(istype(I, /obj/item/gun/energy/laser)) return TRUE -/datum/wound/brute/cut/treat(obj/item/I, mob/user) +/datum/wound/slash/treat(obj/item/I, mob/user) if(istype(I, /obj/item/gun/energy/laser)) las_cauterize(I, user) else if(I.tool_behaviour == TOOL_CAUTERY || I.get_temperature() > 300) tool_cauterize(I, user) - else if(istype(I, /obj/item/stack/medical/gauze)) - bandage(I, user) else if(istype(I, /obj/item/stack/medical/suture)) suture(I, user) -/datum/wound/brute/cut/try_handling(mob/living/carbon/human/user) +/datum/wound/slash/try_handling(mob/living/carbon/human/user) if(user.pulling != victim || user.zone_selected != limb.body_zone || user.a_intent == INTENT_GRAB) return FALSE if(!iscatperson(user)) return FALSE - if(!(user.client?.prefs.vore_flags & LICKABLE)) - return FALSE - lick_wounds(user) return TRUE /// if a felinid is licking this cut to reduce bleeding -/datum/wound/brute/cut/proc/lick_wounds(mob/living/carbon/human/user) +/datum/wound/slash/proc/lick_wounds(mob/living/carbon/human/user) if(INTERACTING_WITH(user, victim)) to_chat(user, "You're already interacting with [victim]!") return + if(user.is_mouth_covered()) + to_chat(user, "Your mouth is covered, you can't lick [victim]'s wounds!") + return + + if(!user.getorganslot(ORGAN_SLOT_TONGUE)) + to_chat(user, "You can't lick wounds without a tongue!") // f in chat + return + + // transmission is one way patient -> felinid since google said cat saliva is antiseptic or whatever, and also because felinids are already risking getting beaten for this even without people suspecting they're spreading a deathvirus + for(var/datum/disease/D in victim.diseases) + user.ForceContractDisease(D) + user.visible_message("[user] begins licking the wounds on [victim]'s [limb.name].", "You begin licking the wounds on [victim]'s [limb.name]...", ignored_mobs=victim) to_chat(victim, "[user] begins to lick the wounds on your [limb.name].You successfully lower the severity of [victim]'s cuts.") -/datum/wound/brute/cut/on_xadone(power) +/datum/wound/slash/on_xadone(power) . = ..() blood_flow -= 0.03 * power // i think it's like a minimum of 3 power, so .09 blood_flow reduction per tick is pretty good for 0 effort +/datum/wound/slash/on_synthflesh(power) + . = ..() + blood_flow -= 0.075 * power // 20u * 0.075 = -1.5 blood flow, pretty good for how little effort it is + /// If someone's putting a laser gun up to our cut to cauterize it -/datum/wound/brute/cut/proc/las_cauterize(obj/item/gun/energy/laser/lasgun, mob/user) +/datum/wound/slash/proc/las_cauterize(obj/item/gun/energy/laser/lasgun, mob/user) var/self_penalty_mult = (user == victim ? 1.25 : 1) user.visible_message("[user] begins aiming [lasgun] directly at [victim]'s [limb.name]...", "You begin aiming [lasgun] directly at [user == victim ? "your" : "[victim]'s"] [limb.name]...") if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) @@ -180,11 +206,10 @@ return victim.emote("scream") blood_flow -= damage / (5 * self_penalty_mult) // 20 / 5 = 4 bloodflow removed, p good - cauterized += damage / (5 * self_penalty_mult) victim.visible_message("The cuts on [victim]'s [limb.name] scar over!") /// If someone is using either a cautery tool or something with heat to cauterize this cut -/datum/wound/brute/cut/proc/tool_cauterize(obj/item/I, mob/user) +/datum/wound/slash/proc/tool_cauterize(obj/item/I, mob/user) var/self_penalty_mult = (user == victim ? 1.5 : 1) user.visible_message("[user] begins cauterizing [victim]'s [limb.name] with [I]...", "You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) @@ -196,7 +221,6 @@ victim.emote("scream") var/blood_cauterized = (0.6 / self_penalty_mult) blood_flow -= blood_cauterized - cauterized += blood_cauterized if(blood_flow > minimum_flow) try_treating(I, user) @@ -204,15 +228,15 @@ to_chat(user, "You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.") /// If someone is using a suture to close this cut -/datum/wound/brute/cut/proc/suture(obj/item/stack/medical/suture/I, mob/user) +/datum/wound/slash/proc/suture(obj/item/stack/medical/suture/I, mob/user) var/self_penalty_mult = (user == victim ? 1.4 : 1) user.visible_message("[user] begins stitching [victim]'s [limb.name] with [I]...", "You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) return user.visible_message("[user] stitches up some of the bleeding on [victim].", "You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].") var/blood_sutured = I.stop_bleeding / self_penalty_mult blood_flow -= blood_sutured - sutured += blood_sutured limb.heal_damage(I.heal_brute, I.heal_burn) if(blood_flow > minimum_flow) @@ -220,95 +244,57 @@ else if(demotes_to) to_chat(user, "You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.") -/// If someone is using gauze on this cut -/datum/wound/brute/cut/proc/bandage(obj/item/stack/I, mob/user) - if(current_bandage) - if(current_bandage.absorption_capacity > I.absorption_capacity + 1) - to_chat(user, "The [current_bandage] on [victim]'s [limb.name] is still in better condition than your [I.name]!") - return - else - user.visible_message("[user] begins rewrapping the cuts on [victim]'s [limb.name] with [I]...", "You begin rewrapping the cuts on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") - else - user.visible_message("[user] begins wrapping the cuts on [victim]'s [limb.name] with [I]...", "You begin wrapping the cuts on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") - if(!do_after(user, base_treat_time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) - return - user.visible_message("[user] applies [I] to [victim]'s [limb.name].", "You bandage some of the bleeding on [user == victim ? "yourself" : "[victim]"].") - QDEL_NULL(current_bandage) - current_bandage = new I.type(limb) - current_bandage.amount = 1 - treat_priority = FALSE - I.use(1) - - -/datum/wound/brute/cut/moderate +/datum/wound/slash/moderate name = "Rough Abrasion" desc = "Patient's skin has been badly scraped, generating moderate blood loss." treat_text = "Application of clean bandages or first-aid grade sutures, followed by food and rest." examine_desc = "has an open cut" occur_text = "is cut open, slowly leaking blood" - sound_effect = 'sound/effects/blood1.ogg' + sound_effect = 'sound/effects/wounds/blood1.ogg' severity = WOUND_SEVERITY_MODERATE initial_flow = 2 minimum_flow = 0.5 max_per_type = 3 - clot_rate = 0.15 - threshold_minimum = 20 + clot_rate = 0.12 + threshold_minimum = 30 threshold_penalty = 10 - status_effect_type = /datum/status_effect/wound/cut/moderate - scarring_descriptions = list("light, faded lines", "minor cut marks", "a small faded slit", "a series of small scars") + status_effect_type = /datum/status_effect/wound/slash/moderate + scar_keyword = "slashmoderate" -/datum/wound/brute/cut/severe +/datum/wound/slash/severe name = "Open Laceration" desc = "Patient's skin is ripped clean open, allowing significant blood loss." treat_text = "Speedy application of first-aid grade sutures and clean bandages, followed by vitals monitoring to ensure recovery." examine_desc = "has a severe cut" occur_text = "is ripped open, veins spurting blood" - sound_effect = 'sound/effects/blood2.ogg' + sound_effect = 'sound/effects/wounds/blood2.ogg' severity = WOUND_SEVERITY_SEVERE initial_flow = 3.25 minimum_flow = 2.75 clot_rate = 0.07 max_per_type = 4 - threshold_minimum = 50 + threshold_minimum = 60 threshold_penalty = 25 - demotes_to = /datum/wound/brute/cut/moderate - status_effect_type = /datum/status_effect/wound/cut/severe - scarring_descriptions = list("a twisted line of faded gashes", "a gnarled sickle-shaped slice scar", "a long-faded puncture wound") + demotes_to = /datum/wound/slash/moderate + status_effect_type = /datum/status_effect/wound/slash/severe + scar_keyword = "slashsevere" -/datum/wound/brute/cut/critical +/datum/wound/slash/critical name = "Weeping Avulsion" desc = "Patient's skin is completely torn open, along with significant loss of tissue. Extreme blood loss will lead to quick death without intervention." treat_text = "Immediate bandaging and either suturing or cauterization, followed by supervised resanguination." - examine_desc = "is spurting blood at an alarming rate" + examine_desc = "is carved down to the bone, spraying blood wildly" occur_text = "is torn open, spraying blood wildly" - sound_effect = 'sound/effects/blood3.ogg' + sound_effect = 'sound/effects/wounds/blood3.ogg' severity = WOUND_SEVERITY_CRITICAL initial_flow = 4.25 minimum_flow = 4 clot_rate = -0.05 // critical cuts actively get worse instead of better max_per_type = 5 - threshold_minimum = 80 + threshold_minimum = 90 threshold_penalty = 40 - demotes_to = /datum/wound/brute/cut/severe - status_effect_type = /datum/status_effect/wound/cut/critical - scarring_descriptions = list("a winding path of very badly healed scar tissue", "a series of peaks and valleys along a gruesome line of cut scar tissue", "a grotesque snake of indentations and stitching scars") - -// TODO: see about moving dismemberment over to this, i'll have to add judging dismembering power/wound potential wrt item size i guess -/datum/wound/brute/cut/loss - name = "Dismembered" - desc = "oof ouch!!" - occur_text = "is violently dismembered!" - sound_effect = 'sound/effects/dismember.ogg' - viable_zones = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) - severity = WOUND_SEVERITY_LOSS - threshold_minimum = 180 - status_effect_type = null - -/datum/wound/brute/cut/loss/apply_wound(obj/item/bodypart/L, silent, datum/wound/brute/cut/old_wound, smited = FALSE) - if(!L.dismemberable) - qdel(src) - return - - L.dismember() - qdel(src) + demotes_to = /datum/wound/slash/severe + status_effect_type = /datum/status_effect/wound/slash/critical + scar_keyword = "slashcritical" + wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | MANGLES_FLESH) diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm index afa3dbfeaa..a27cb02ea8 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -62,7 +62,7 @@ hitsound = null attack_verb_on = list("slipped") clumsy_check = FALSE - sharpness = IS_BLUNT + sharpness = SHARP_NONE sword_color = "yellow" heat = 0 light_color = "#ffff00" diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index b5e752cc6b..4771e2eca7 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1112,7 +1112,6 @@ detonated = 1 charge = null for(var/mob/living/carbon/human/H in orange(2,src)) - H.Unconscious(160) H.adjust_fire_stacks(20) H.IgniteMob() //Guaranteed knockout and ignition for nearby people H.apply_damage(40, BRUTE, BODY_ZONE_CHEST) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index f3886d0036..4248e1684f 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -342,7 +342,8 @@ L.visible_message("[src] closes on [L], crushing [L.p_them()]!", "[src] closes on you and crushes you!") if(iscarbon(L)) var/mob/living/carbon/C = L - for(var/datum/wound/W in C.all_wounds) + for(var/i in C.all_wounds) // should probably replace with signal + var/datum/wound/W = i W.crush(DOOR_CRUSH_DAMAGE) if(isalien(L)) //For xenos L.adjustBruteLoss(DOOR_CRUSH_DAMAGE * 1.5) //Xenos go into crit after aproximately the same amount of crushes as humans. diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 2a60711a81..f69a722473 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -533,16 +533,16 @@ return /obj/machinery/porta_turret/proc/shootAt(atom/movable/target, stagger_enabled = FALSE) - if(stagger_enabled) - randomize_shot_stagger() - sleep(shot_stagger) if(!raised) //the turret has to be raised in order to fire - makes sense, right? return - if(!(obj_flags & EMAGGED)) //if it hasn't been emagged, cooldown before shooting again - if(last_fired + shot_delay > world.time) - return - last_fired = world.time + if(last_fired + shot_delay > world.time) + return + last_fired = world.time + + if(stagger_enabled) + randomize_shot_stagger() + sleep(shot_stagger) var/turf/T = get_turf(src) var/turf/U = get_turf(target) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 5870c8a780..b4c114eb6a 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -103,12 +103,12 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb mouse_drag_pointer = MOUSE_ACTIVE_POINTER //the icon to indicate this object is being dragged - var/list/embedding = NONE + var/list/embedding var/flags_cover = 0 //for flags such as GLASSESCOVERSEYES var/heat = 0 - ///All items with sharpness of IS_SHARP or higher will automatically get the butchering component. - var/sharpness = IS_BLUNT + ///All items with sharpness of SHARP_EDGED or higher will automatically get the butchering component. + var/sharpness = SHARP_NONE var/tool_behaviour = NONE var/toolspeed = 1 @@ -206,7 +206,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb if(GLOB.rpg_loot_items) AddComponent(/datum/component/fantasy) - if(sharpness) //give sharp objects butchering functionality, for consistency + if(sharpness && force > 5) //give sharp objects butchering functionality, for consistency AddComponent(/datum/component/butchering, 80 * toolspeed) /obj/item/proc/check_allowed_items(atom/target, not_inside, target_self) @@ -1090,7 +1090,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb /obj/item/proc/updateEmbedding() - if(!islist(embedding) || !LAZYLEN(embedding)) + if(!LAZYLEN(embedding)) return AddElement(/datum/element/embed,\ diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index f382aa1ed3..ebb26fab93 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -16,7 +16,7 @@ custom_materials = list(/datum/material/iron=13000) attack_verb = list("sawed", "torn", "cut", "chopped", "diced") hitsound = "swing_hit" - sharpness = IS_SHARP + sharpness = SHARP_EDGED actions_types = list(/datum/action/item_action/startchainsaw) tool_behaviour = TOOL_SAW toolspeed = 0.5 @@ -71,10 +71,6 @@ /obj/item/chainsaw/update_icon_state() icon_state = "chainsaw_[on ? "on" : "off"]" -/obj/item/chainsaw/get_dismemberment_chance() - if(wielded) - . = ..() - /obj/item/chainsaw/doomslayer name = "THE GREAT COMMUNICATOR" desc = "VRRRRRRR!!!" diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index 08460993ee..9db9449fcb 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -105,7 +105,7 @@ to_chat(user, "You lack the grace to wield this!") return COMPONENT_TWOHANDED_BLOCK_WIELD wielded = TRUE - sharpness = IS_SHARP + sharpness = SHARP_EDGED w_class = w_class_on total_mass = total_mass_on hitsound = 'sound/weapons/blade1.ogg' diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm index 7cb22d5eb0..6fb7b89262 100644 --- a/code/game/objects/items/fireaxe.dm +++ b/code/game/objects/items/fireaxe.dm @@ -13,11 +13,12 @@ slot_flags = ITEM_SLOT_BACK attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30) resistance_flags = FIRE_PROOF - wound_bonus = -20 + wound_bonus = -15 + bare_wound_bonus = 20 var/wielded = FALSE // track wielded status on item /obj/item/fireaxe/Initialize() diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 691b4c4228..58146be20f 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -352,7 +352,7 @@ w_class = WEIGHT_CLASS_HUGE slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT block_chance = 30 - sharpness = IS_SHARP + sharpness = SHARP_EDGED hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -452,7 +452,7 @@ w_class = WEIGHT_CLASS_BULKY armour_penetration = 35 slot_flags = ITEM_SLOT_BACK - sharpness = IS_SHARP + sharpness = SHARP_EDGED attack_verb = list("chopped", "sliced", "cut", "reaped") /obj/item/nullrod/scythe/Initialize() @@ -575,7 +575,7 @@ righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' w_class = WEIGHT_CLASS_HUGE item_flags = ABSTRACT - sharpness = IS_SHARP + sharpness = SHARP_EDGED attack_verb = list("sawed", "torn", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsawhit.ogg' total_mass = TOTAL_MASS_HAND_REPLACEMENT @@ -594,7 +594,7 @@ name = "clown dagger" desc = "Used for absolutely hilarious sacrifices." hitsound = 'sound/items/bikehorn.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") /obj/item/nullrod/pride_hammer @@ -645,7 +645,7 @@ throw_speed = 4 throw_range = 7 throwforce = 30 - sharpness = IS_SHARP + sharpness = SHARP_EDGED attack_verb = list("enlightened", "redpilled") /obj/item/nullrod/armblade @@ -657,7 +657,7 @@ righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi' item_flags = ABSTRACT w_class = WEIGHT_CLASS_HUGE - sharpness = IS_SHARP + sharpness = SHARP_EDGED wound_bonus = -20 bare_wound_bonus = 25 total_mass = TOTAL_MASS_HAND_REPLACEMENT @@ -699,7 +699,7 @@ force = 15 block_chance = 40 slot_flags = ITEM_SLOT_BACK - sharpness = IS_BLUNT + sharpness = SHARP_NONE hitsound = "swing_hit" attack_verb = list("smashed", "slammed", "whacked", "thwacked") icon = 'icons/obj/items_and_weapons.dmi' @@ -754,7 +754,7 @@ name = "arrhythmic knife" w_class = WEIGHT_CLASS_HUGE desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn." - sharpness = IS_SHARP + sharpness = SHARP_EDGED slot_flags = null hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -782,7 +782,7 @@ desc = "Holding this makes you look absolutely devilish." attack_verb = list("poked", "impaled", "pierced", "jabbed") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/nullrod/egyptian name = "egyptian staff" diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index 6cdc5ee824..897cb9b750 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -38,6 +38,23 @@ if(!uses) qdel(src) +/obj/item/implant/warp + name = "warp implant" + desc = "Saves your position somewhere, and then warps you back to it after five seconds." + icon_state = "warp" + uses = 15 + +/obj/item/implant/warp/activate() + . = ..() + uses-- + imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list(/datum/reagent/fermi/eigenstate = 1.2), "You feel an internal prick as as the bluespace starts ramping up!") + to_chat(imp_in, "You feel an internal prick as as the bluespace starts ramping up!") + if(!uses) + qdel(src) + +/obj/item/implanter/warp + name = "implanter (warp)" + imp_type = /obj/item/implant/warp /obj/item/implant/emp name = "emp implant" diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 8f274c04aa..e7cf8defc9 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -18,7 +18,7 @@ name = "fork" desc = "Pointy." icon_state = "fork" - force = 5 + force = 4 w_class = WEIGHT_CLASS_TINY throwforce = 0 throw_speed = 3 @@ -28,6 +28,7 @@ attack_verb = list("attacked", "stabbed", "poked") hitsound = 'sound/weapons/bladeslice.ogg' armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) + sharpness = SHARP_POINTY var/datum/reagent/forkload //used to eat omelette /obj/item/kitchen/fork/suicide_act(mob/living/carbon/user) @@ -61,7 +62,7 @@ throw_speed = 4 throw_range = 6 embedding = list("pain_mult" = 2, "embed_chance" = 100, "fall_chance" = 0, "embed_chance_turf_mod" = 15) - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/kitchen/knife name = "kitchen knife" @@ -76,7 +77,7 @@ throw_range = 6 custom_materials = list(/datum/material/iron=12000) attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharpness = IS_SHARP_ACCURATE + sharpness = SHARP_POINTY armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) var/bayonet = FALSE //Can this be attached to a gun? wound_bonus = -5 diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index ef5b7b6cba..b2f8b4bee2 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -54,5 +54,5 @@ var/obj/item/tank/T = W blow(T, user) return - if (W.get_sharpness() || W.get_temperature() || is_pointed(W)) + if (W.get_sharpness() || W.get_temperature()) burst() diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index e0b08ba8ef..679491aeb6 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -102,7 +102,7 @@ attack_verb_off = list("tapped", "poked") throw_speed = 3 throw_range = 5 - sharpness = IS_SHARP + sharpness = SHARP_EDGED embedding = list("embed_chance" = 75, "impact_pain_mult" = 10) armour_penetration = 35 item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY @@ -180,7 +180,7 @@ sword_color = null //stops icon from breaking when turned on. hitcost = 75 //Costs more than a standard cyborg esword w_class = WEIGHT_CLASS_NORMAL - sharpness = IS_SHARP + sharpness = SHARP_EDGED light_color = "#40ceff" tool_behaviour = TOOL_SAW toolspeed = 0.7 @@ -255,7 +255,7 @@ throw_range = 1 w_class = WEIGHT_CLASS_BULKY//So you can't hide it in your pocket or some such. var/datum/effect_system/spark_spread/spark_system - sharpness = IS_SHARP + sharpness = SHARP_EDGED //Most of the other special functions are handled in their own files. aka special snowflake code so kewl /obj/item/melee/transforming/energy/blade/Initialize() @@ -291,7 +291,7 @@ attack_verb_off = list("tapped", "poked") throw_speed = 3 throw_range = 5 - sharpness = IS_SHARP + sharpness = SHARP_EDGED embedding = list("embedded_pain_multiplier" = 6, "embed_chance" = 20, "embedded_fall_chance" = 60) armour_penetration = 10 block_chance = 35 diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 9a7d455df6..01d2924a90 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -44,7 +44,7 @@ throwforce = 10 hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "impaled", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharpness = IS_SHARP + sharpness = SHARP_EDGED total_mass = TOTAL_MASS_HAND_REPLACEMENT /obj/item/melee/synthetic_arm_blade/Initialize() @@ -64,7 +64,7 @@ throwforce = 15 w_class = WEIGHT_CLASS_BULKY armour_penetration = 75 - sharpness = IS_SHARP + sharpness = SHARP_EDGED attack_verb = list("slashed", "cut") hitsound = 'sound/weapons/rapierhit.ogg' custom_materials = list(/datum/material/iron = 1000) @@ -168,7 +168,7 @@ flags_1 = CONDUCT_1 obj_flags = UNIQUE_RENAME w_class = WEIGHT_CLASS_BULKY - sharpness = IS_SHARP_ACCURATE //It cant be sharpend cook -_- + sharpness = SHARP_POINTY //It cant be sharpend cook -_- attack_verb = list("stabs", "punctures", "pierces", "pokes") hitsound = 'sound/weapons/rapierhit.ogg' total_mass = 0.4 diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm index 66752c4c9a..8c44a15cd4 100644 --- a/code/game/objects/items/melee/transforming.dm +++ b/code/game/objects/items/melee/transforming.dm @@ -1,5 +1,5 @@ /obj/item/melee/transforming - sharpness = IS_SHARP + sharpness = SHARP_EDGED var/active = FALSE var/force_on = 30 //force when active var/faction_bonus_force = 0 //Bonus force dealt against certain factions diff --git a/code/game/objects/items/pitchfork.dm b/code/game/objects/items/pitchfork.dm index 49d0b64498..b296e2d0cb 100644 --- a/code/game/objects/items/pitchfork.dm +++ b/code/game/objects/items/pitchfork.dm @@ -9,7 +9,7 @@ w_class = WEIGHT_CLASS_BULKY attack_verb = list("attacked", "impaled", "pierced") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30) resistance_flags = FIRE_PROOF diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm index 6bf0b27fb4..fc19e61cd6 100644 --- a/code/game/objects/items/sharpener.dm +++ b/code/game/objects/items/sharpener.dm @@ -39,7 +39,7 @@ I.force = clamp(I.force + increment, 0, max) user.visible_message("[user] sharpens [I] with [src]!", "You sharpen [I], making it much more deadly than before.") - I.sharpness = IS_SHARP_ACCURATE + I.sharpness = SHARP_POINTY I.throwforce = clamp(I.throwforce + increment, 0, max) I.name = "[prefix] [I.name]" name = "worn out [name]" diff --git a/code/game/objects/items/shrapnel.dm b/code/game/objects/items/shrapnel.dm index b74b0563b7..5904cb6c0b 100644 --- a/code/game/objects/items/shrapnel.dm +++ b/code/game/objects/items/shrapnel.dm @@ -7,13 +7,13 @@ icon_state = "large" w_class = WEIGHT_CLASS_TINY item_flags = DROPDEL - sharpness = TRUE + sharpness = SHARP_EDGED /obj/item/shrapnel/stingball // stingbang grenades name = "stingball" embedding = list(embed_chance=90, fall_chance=3, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.7, pain_mult=5, jostle_pain_mult=6, rip_time=15, embed_chance_turf_mod=-100) icon_state = "tiny" - sharpness = FALSE + sharpness = SHARP_NONE /obj/item/shrapnel/bullet // bullets name = "bullet" @@ -30,23 +30,24 @@ /obj/item/projectile/bullet/shrapnel name = "flying shrapnel shard" - damage = 8 - range = 10 + damage = 14 + range = 20 armour_penetration = -30 dismemberment = 5 ricochets_max = 2 - ricochet_chance = 40 + ricochet_chance = 70 shrapnel_type = /obj/item/shrapnel ricochet_incidence_leeway = 60 - sharpness = TRUE - wound_bonus = 30 + sharpness = SHARP_EDGED + wound_bonus = 40 /obj/item/projectile/bullet/shrapnel/mega name = "flying shrapnel hunk" - range = 25 - dismemberment = 10 - ricochets_max = 4 - ricochet_chance = 90 + range = 45 + dismemberment = 15 + ricochets_max = 6 + ricochet_chance = 130 + ricochet_incidence_leeway = 0 ricochet_decay_chance = 0.9 /obj/item/projectile/bullet/pellet/stingball @@ -71,10 +72,10 @@ name = "breakbang pellet" damage = 10 wound_bonus = 40 - sharpness = FALSE + sharpness = SHARP_NONE /obj/item/projectile/bullet/pellet/stingball/shred name = "shredbang pellet" damage = 10 wound_bonus = 30 - sharpness = TRUE + sharpness = SHARP_EDGED diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index 41cb68559b..f40c774551 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -15,14 +15,14 @@ custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075) hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") - sharpness = IS_SHARP + sharpness = SHARP_EDGED max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) var/obj/item/grenade/explosive = null var/war_cry = "AAAAARGH!!!" var/icon_prefix = "spearglass" var/wielded = FALSE // track wielded status on item - wound_bonus = -25 + wound_bonus = -15 bare_wound_bonus = 15 /obj/item/spear/Initialize() @@ -179,7 +179,7 @@ custom_materials = null hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") - sharpness = IS_SHARP + sharpness = SHARP_EDGED icon_prefix = "bone_spear" /obj/item/spear/bonespear/ComponentInitialize() diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 1ceb525b8a..6b6e9d7d65 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -28,8 +28,7 @@ /obj/item/stack/medical/attack(mob/living/M, mob/user) . = ..() - try_heal(M, user) - + INVOKE_ASYNC(src, .proc/try_heal, M, user) /obj/item/stack/medical/proc/try_heal(mob/living/M, mob/user, silent = FALSE) if(!M.can_inject(user, TRUE)) @@ -132,11 +131,34 @@ // gauze is only relevant for wounds, which are handled in the wounds themselves /obj/item/stack/medical/gauze/try_heal(mob/living/M, mob/user, silent) var/obj/item/bodypart/limb = M.get_bodypart(check_zone(user.zone_selected)) - if(limb) - if(limb.brute_dam > 40) - to_chat(user, "The bleeding on [user==M ? "your" : "[M]'s"] [limb.name] is from bruising, and cannot be treated with [src]!") - else - to_chat(user, "There's no bleeding on [user==M ? "your" : "[M]'s"] [limb.name]") + if(!limb) + to_chat(user, "There's nothing there to bandage!") + return + if(!LAZYLEN(limb.wounds)) + to_chat(user, "There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!") // good problem to have imo + return + + var/gauzeable_wound = FALSE + for(var/i in limb.wounds) + var/datum/wound/woundies = i + if(woundies.wound_flags & ACCEPTS_GAUZE) + gauzeable_wound = TRUE + break + if(!gauzeable_wound) + to_chat(user, "There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!") // good problem to have imo + return + + if(limb.current_gauze && (limb.current_gauze.absorption_capacity * 0.8 > absorption_capacity)) // ignore if our new wrap is < 20% better than the current one, so someone doesn't bandage it 5 times in a row + to_chat(user, "The bandage currently on [user==M ? "your" : "[M]'s"] [limb.name] is still in good condition!") + return + + user.visible_message("[user] begins wrapping the wounds on [M]'s [limb.name] with [src]...", "You begin wrapping the wounds on [user == M ? "your" : "[M]'s"] [limb.name] with [src]...") + + if(!do_after(user, (user == M ? self_delay : other_delay), target=M)) + return + + user.visible_message("[user] applies [src] to [M]'s [limb.name].", "You bandage the wounds on [user == M ? "yourself" : "[M]'s"] [limb.name].") + limb.apply_gauze(src) /obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WIRECUTTER || I.get_sharpness()) @@ -378,9 +400,9 @@ C.emote("scream") for(var/i in C.bodyparts) var/obj/item/bodypart/bone = i - var/datum/wound/brute/bone/severe/oof_ouch = new + var/datum/wound/blunt/severe/oof_ouch = new oof_ouch.apply_wound(bone) - var/datum/wound/brute/bone/critical/oof_OUCH = new + var/datum/wound/blunt/critical/oof_OUCH = new oof_OUCH.apply_wound(bone) for(var/i in C.bodyparts) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index d4baea2487..29b4dea6d8 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -289,7 +289,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( resistance_flags = ACID_PROOF armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100) max_integrity = 40 - sharpness = IS_SHARP + sharpness = SHARP_EDGED var/icon_prefix embedding = list("embed_chance" = 65) diff --git a/code/game/objects/items/storage/_storage.dm b/code/game/objects/items/storage/_storage.dm index fd4cc793ab..2fc1b6484d 100644 --- a/code/game/objects/items/storage/_storage.dm +++ b/code/game/objects/items/storage/_storage.dm @@ -19,8 +19,9 @@ return TRUE /obj/item/storage/contents_explosion(severity, target) + var/in_storage = istype(loc, /obj/item/storage)? (max(0, severity - 1)) : (severity) for(var/atom/A in contents) - A.ex_act(severity, target) + A.ex_act(in_storage, target) CHECK_TICK //Cyberboss says: "USE THIS TO FILL IT, NOT INITIALIZE OR NEW" diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 5e3ff67f4c..ed0ee8ad07 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -20,7 +20,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons) var/has_latches = TRUE var/can_rubberify = TRUE rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE //very protecc too - wound_bonus = 5 + wound_bonus = -10 + bare_wound_bonus = 5 /obj/item/storage/toolbox/greyscale icon_state = "toolbox_default" diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 3b66e32d0a..bad858aa21 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -169,6 +169,14 @@ O.imp = new /obj/item/implant/freedom(O) O.update_icon() +/obj/item/storage/box/syndie_kit/imp_warp + name = "boxed warp implant (with injector)" + +/obj/item/storage/box/syndie_kit/imp_warp/PopulateContents() + var/obj/item/implanter/O = new(src) + O.imp = new /obj/item/implant/warp(O) + O.update_icon() + /obj/item/storage/box/syndie_kit/imp_microbomb name = "Microbomb Implant (with injector)" diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index d39da2f543..6159ab7ba0 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -18,6 +18,9 @@ toolspeed = 1 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) + wound_bonus = -10 + bare_wound_bonus = 5 + /obj/item/crowbar/suicide_act(mob/user) user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index e9f517a9f1..86c223606d 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -31,6 +31,9 @@ "yellow" = rgb(255, 165, 0) ) + wound_bonus = -10 + bare_wound_bonus = 5 + /obj/item/screwdriver/suicide_act(mob/user) user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") return(BRUTELOSS) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 9560f7fab3..2e12a2ab8c 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -33,6 +33,8 @@ heat = 3800 tool_behaviour = TOOL_WELDER toolspeed = 1 + wound_bonus = 0 + bare_wound_bonus = 5 /obj/item/weldingtool/Initialize() . = ..() diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index 678096db28..e1c09f394e 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -18,6 +18,9 @@ toolspeed = 1 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) + wound_bonus = -10 + bare_wound_bonus = 5 + /obj/item/wrench/suicide_act(mob/user) user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 58b282be7d..4e82df2452 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -447,7 +447,7 @@ block_parry_data = null attack_verb = list("attacked", "struck", "hit") total_mass_on = TOTAL_MASS_TOY_SWORD - sharpness = IS_BLUNT + sharpness = SHARP_NONE /obj/item/dualsaber/toy/ComponentInitialize() AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=0, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg') @@ -466,7 +466,7 @@ attack_verb = list("attacked", "struck", "hit") total_mass_on = TOTAL_MASS_TOY_SWORD slowdown_wielded = 0 - sharpness = IS_BLUNT + sharpness = SHARP_NONE /obj/item/dualsaber/hypereutactic/toy/ComponentInitialize() AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=0, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg') diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index e789bbe71f..82597615bc 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -65,7 +65,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 w_class = WEIGHT_CLASS_NORMAL attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 50 - sharpness = IS_SHARP + sharpness = SHARP_EDGED max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF @@ -231,7 +231,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 50 - sharpness = IS_SHARP + sharpness = SHARP_EDGED max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF @@ -380,6 +380,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 w_class = WEIGHT_CLASS_NORMAL custom_materials = list(/datum/material/iron=1150, /datum/material/glass=75) attack_verb = list("hit", "bludgeoned", "whacked", "bonked") + wound_bonus = -10 /obj/item/wirerod/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/shard)) @@ -417,13 +418,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' force = 2 - throwforce = 20 //This is never used on mobs since this has a 100% embed chance. + throwforce = 10 //This is never used on mobs since this has a 100% embed chance. throw_speed = 4 embedding = list("pain_mult" = 4, "embed_chance" = 100, "fall_chance" = 0, "embed_chance_turf_mod" = 15) armour_penetration = 40 w_class = WEIGHT_CLASS_SMALL - sharpness = IS_SHARP + sharpness = SHARP_EDGED custom_materials = list(/datum/material/iron=500, /datum/material/glass=500) resistance_flags = FIRE_PROOF @@ -436,7 +437,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/throwing_star/toy name = "toy throwing star" desc = "An aerodynamic disc strapped with adhesive for sticking to people, good for playing pranks and getting yourself killed by security." - sharpness = IS_BLUNT + sharpness = SHARP_NONE force = 0 throwforce = 0 embedding = list("pain_mult" = 0, "jostle_pain_mult" = 0, "embed_chance" = 100, "fall_chance" = 0) @@ -473,7 +474,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 icon_state = extended_icon_state attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED else force = initial(force) w_class = WEIGHT_CLASS_SMALL @@ -481,7 +482,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 icon_state = retracted_icon_state attack_verb = list("stubbed", "poked") hitsound = 'sound/weapons/genhit.ogg' - sharpness = IS_BLUNT + sharpness = SHARP_NONE /obj/item/switchblade/suicide_act(mob/user) user.visible_message("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!") @@ -582,7 +583,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 throwforce = 0 throw_range = 0 throw_speed = 0 - sharpness = IS_SHARP + sharpness = SHARP_EDGED attack_verb = list("sawed", "torn", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsawhit.ogg' total_mass = TOTAL_MASS_HAND_REPLACEMENT @@ -711,6 +712,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 obj_flags = UNIQUE_RENAME var/chaplain_spawnable = TRUE total_mass = TOTAL_MASS_MEDIEVAL_WEAPON + wound_bonus = -5 /obj/item/melee/baseball_bat/chaplain/Initialize() . = ..() @@ -980,7 +982,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 block_chance = 40 throwforce = 20 throw_speed = 4 - sharpness = IS_SHARP + sharpness = SHARP_EDGED attack_verb = list("cut", "sliced", "diced") w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 37248f814c..0623f2b9d2 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -127,18 +127,45 @@ dismantle_wall(1) return -/turf/closed/wall/attack_hulk(mob/user, does_attack_animation = 0) - ..(user, 1) +/turf/closed/wall/attack_hulk(mob/living/carbon/user) + ..() + var/obj/item/bodypart/arm = user.hand_bodyparts[user.active_hand_index] + if(!arm) + return + if(arm.disabled) + return if(prob(hardness)) - playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) + playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk") + hulk_recoil(arm, user) dismantle_wall(1) + else - playsound(src, 'sound/effects/bang.ogg', 50, 1) + playsound(src, 'sound/effects/bang.ogg', 50, TRUE) add_dent(WALL_DENT_HIT) - to_chat(user, text("You punch the wall.")) + user.visible_message("[user] smashes \the [src]!", \ + "You smash \the [src]!", \ + "You hear a booming smash!") return TRUE +/** + *Deals damage back to the hulk's arm. + * + *When a hulk manages to break a wall using their hulk smash, this deals back damage to the arm used. + *This is in its own proc just to be easily overridden by other wall types. Default allows for three + *smashed walls per arm. Also, we use CANT_WOUND here because wounds are random. Wounds are applied + *by hulk code based on arm damage and checked when we call break_an_arm(). + *Arguments: + **arg1 is the arm to deal damage to. + **arg2 is the hulk + */ +/turf/closed/wall/proc/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, var/damage = 20) + arm.receive_damage(brute = damage, blocked = 0, wound_bonus = CANT_WOUND) + var/datum/mutation/human/hulk/smasher = locate(/datum/mutation/human/hulk) in hulkman.dna.mutations + if(!smasher || !damage) //sanity check but also snow and wood walls deal no recoil damage, so no arm breaky + return + smasher.break_an_arm(arm) + /turf/closed/wall/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) to_chat(user, "You push the wall but nothing happens!") playsound(src, 'sound/weapons/genhit.ogg', 25, 1) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c559135bd1..5997558c60 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1283,9 +1283,9 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits ADMIN_PUNISHMENT_SHOES, ADMIN_PUNISHMENT_PICKLE, ADMIN_PUNISHMENT_FRY, - ADMIN_PUNISHMENT_CRACK, - ADMIN_PUNISHMENT_BLEED, - ADMIN_PUNISHMENT_SCARIFY) + ADMIN_PUNISHMENT_CRACK, + ADMIN_PUNISHMENT_BLEED, + ADMIN_PUNISHMENT_SCARIFY) var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list @@ -1368,28 +1368,74 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits to_chat(usr,"This must be used on a carbon mob.", confidential = TRUE) return var/mob/living/carbon/C = target - for(var/obj/item/bodypart/squish_part in C.bodyparts) - var/type_wound = pick(list(/datum/wound/brute/bone/critical, /datum/wound/brute/bone/severe, /datum/wound/brute/bone/critical, /datum/wound/brute/bone/severe, /datum/wound/brute/bone/moderate)) + for(var/i in C.bodyparts) + var/obj/item/bodypart/squish_part = i + var/type_wound = pick(list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate)) squish_part.force_wound_upwards(type_wound, smited=TRUE) if(ADMIN_PUNISHMENT_BLEED) if(!iscarbon(target)) to_chat(usr,"This must be used on a carbon mob.", confidential = TRUE) return var/mob/living/carbon/C = target - for(var/obj/item/bodypart/slice_part in C.bodyparts) - var/type_wound = pick(list(/datum/wound/brute/cut/severe, /datum/wound/brute/cut/moderate)) + for(var/i in C.bodyparts) + var/obj/item/bodypart/slice_part = i + var/type_wound = pick(list(/datum/wound/slash/severe, /datum/wound/slash/moderate)) slice_part.force_wound_upwards(type_wound, smited=TRUE) - type_wound = pick(list(/datum/wound/brute/cut/critical, /datum/wound/brute/cut/severe, /datum/wound/brute/cut/moderate)) + type_wound = pick(list(/datum/wound/slash/critical, /datum/wound/slash/severe, /datum/wound/slash/moderate)) slice_part.force_wound_upwards(type_wound, smited=TRUE) - type_wound = pick(list(/datum/wound/brute/cut/critical, /datum/wound/brute/cut/severe)) + type_wound = pick(list(/datum/wound/slash/critical, /datum/wound/slash/severe)) slice_part.force_wound_upwards(type_wound, smited=TRUE) if(ADMIN_PUNISHMENT_SCARIFY) if(!iscarbon(target)) to_chat(usr,"This must be used on a carbon mob.", confidential = TRUE) return - var/mob/living/carbon/C = target - C.generate_fake_scars(rand(1, 4)) - to_chat(C, "You feel your body grow jaded and torn...") + var/mob/living/carbon/dude = target + dude.generate_fake_scars(rand(1, 4)) + to_chat(dude, "You feel your body grow jaded and torn...") + if(ADMIN_PUNISHMENT_PERFORATE) + if(!iscarbon(target)) + to_chat(usr,"This must be used on a carbon mob.", confidential = TRUE) + return + + var/list/how_fucked_is_this_dude = list("A little", "A lot", "So fucking much", "FUCK THIS DUDE") + var/hatred = input("How much do you hate this guy?") in how_fucked_is_this_dude + var/repetitions + var/shots_per_limb_per_rep = 2 + var/damage + switch(hatred) + if("A little") + repetitions = 1 + damage = 5 + if("A lot") + repetitions = 2 + + damage = 8 + if("So fucking much") + repetitions = 3 + damage = 10 + if("FUCK THIS DUDE") + repetitions = 4 + damage = 10 + + var/mob/living/carbon/dude = target + var/list/open_adj_turfs = get_adjacent_open_turfs(dude) + var/list/wound_bonuses = list(15, 70, 110, 250) + + var/delay_per_shot = 1 + var/delay_counter = 1 + + dude.Immobilize(5 SECONDS) + for(var/wound_bonus_rep in 1 to repetitions) + for(var/i in dude.bodyparts) + var/obj/item/bodypart/slice_part = i + var/shots_this_limb = 0 + for(var/t in shuffle(open_adj_turfs)) + var/turf/iter_turf = t + addtimer(CALLBACK(GLOBAL_PROC, .proc/firing_squad, dude, iter_turf, slice_part.body_zone, wound_bonuses[wound_bonus_rep], damage), delay_counter) + delay_counter += delay_per_shot + shots_this_limb++ + if(shots_this_limb > shots_per_limb_per_rep) + break if(ADMIN_PUNISHMENT_PICKLE) target.turn_into_pickle() if(ADMIN_PUNISHMENT_FRY) @@ -1408,6 +1454,31 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits punish_log(target, punishment) +/** + * firing_squad is a proc for the :B:erforate smite to shoot each individual bullet at them, so that we can add actual delays without sleep() nonsense + * + * Hilariously, if you drag someone away mid smite, the bullets will still chase after them from the original spot, possibly hitting other people. Too funny to fix imo + * + * Arguments: + * * target- guy we're shooting obviously + * * source_turf- where the bullet begins, preferably on a turf next to the target + * * body_zone- which bodypart we're aiming for, if there is one there + * * wound_bonus- the wounding power we're assigning to the bullet, since we don't care about the base one + * * damage- the damage we're assigning to the bullet, since we don't care about the base one + */ +/proc/firing_squad(mob/living/carbon/target, turf/source_turf, body_zone, wound_bonus, damage) + if(!target.get_bodypart(body_zone)) + return + playsound(target, 'sound/weapons/shot.ogg', 100) + var/obj/item/projectile/bullet/smite/divine_wrath = new(source_turf) + divine_wrath.damage = damage + divine_wrath.wound_bonus = wound_bonus + divine_wrath.original = target + divine_wrath.def_zone = body_zone + divine_wrath.spread = 0 + divine_wrath.preparePixelProjectile(target, source_turf) + divine_wrath.fire() + /client/proc/punish_log(var/whom, var/punishment) var/msg = "[key_name_admin(usr)] punished [key_name_admin(whom)] with [punishment]." message_admins(msg) diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm index 2d25ebb156..a81f702a75 100644 --- a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm +++ b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm @@ -270,13 +270,15 @@ /datum/antagonist/bloodsucker/AmFinalDeath() return owner && owner.AmFinalDeath() -/datum/antagonist/changeling/AmFinalDeath() - return owner && owner.AmFinalDeath() /datum/mind/proc/AmFinalDeath() return !current || QDELETED(current) || !isliving(current) || isbrain(current) || !get_turf(current) // NOTE: "isliving()" is not the same as STAT == CONSCIOUS. This is to make sure you're not a BORG (aka silicon) /datum/antagonist/bloodsucker/proc/FinalDeath() + //Dont bother if we are already supposed to be dead + if(FinalDeath) + return + FinalDeath = TRUE //We are now supposed to die. Lets not spam it. if(!iscarbon(owner.current)) //Check for non carbons. owner.current.gib() return diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm index 715de0648d..1fcffff810 100644 --- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm +++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm @@ -38,6 +38,7 @@ var/level_bloodcost var/passive_blood_drain = -0.1 //The amount of blood we loose each bloodsucker life() tick var/notice_healing //Var to see if you are healing for preventing spam of the chat message inform the user of such + var/FinalDeath //Have we reached final death? Used to prevent spam. // LISTS var/static/list/defaultTraits = list (TRAIT_STABLEHEART, TRAIT_NOBREATH, TRAIT_SLEEPIMMUNE, TRAIT_NOCRITDAMAGE, TRAIT_RESISTCOLD, TRAIT_RADIMMUNE, TRAIT_NIGHT_VISION, \ TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT, TRAIT_AGEUSIA, TRAIT_COLDBLOODED, TRAIT_NONATURALHEAL, TRAIT_NOMARROW, TRAIT_NOPULSE, TRAIT_VIRUSIMMUNE, TRAIT_NODECAP, TRAIT_NOGUT) @@ -683,6 +684,8 @@ owner.current.hud_used.sunlight_display.invisibility = INVISIBILITY_ABSTRACT /datum/antagonist/bloodsucker/proc/update_hud(updateRank=FALSE) + if(FinalDeath) + return // No Hud? Get out. if(!owner.current.hud_used) return diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm index 9af2553644..536c07cd62 100644 --- a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm +++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm @@ -361,9 +361,9 @@ torture_time -= I.force / 4 torture_dmg_brute += I.force / 4 //torture_dmg_burn += I. - if(I.sharpness == IS_SHARP) + if(I.sharpness == SHARP_EDGED) torture_time -= 1 - else if(I.sharpness == IS_SHARP_ACCURATE) + else if(I.sharpness == SHARP_POINTY) torture_time -= 2 if(istype(I, /obj/item/weldingtool)) var/obj/item/weldingtool/welder = I diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 7d50374e96..24288be078 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -164,7 +164,7 @@ armour_penetration = 20 hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharpness = IS_SHARP + sharpness = SHARP_EDGED wound_bonus = -60 bare_wound_bonus = 20 var/can_drop = FALSE diff --git a/code/modules/antagonists/changeling/powers/regenerate.dm b/code/modules/antagonists/changeling/powers/regenerate.dm index bcebd8c62e..a88422e7eb 100644 --- a/code/modules/antagonists/changeling/powers/regenerate.dm +++ b/code/modules/antagonists/changeling/powers/regenerate.dm @@ -30,8 +30,8 @@ C.regenerate_limbs(1) C.regenerate_organs() for(var/i in C.all_wounds) - var/datum/wound/W = i - W.remove_wound() + var/datum/wound/iter_wound = i + iter_wound.remove_wound() if(!user.getorganslot(ORGAN_SLOT_BRAIN)) var/obj/item/organ/brain/B if(C.has_dna() && C.dna.species.mutant_brain) diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm index 527745b81a..a2d597e27d 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm @@ -8,7 +8,7 @@ force = 15 //Extra damage is dealt to targets in attack() throwforce = 25 armour_penetration = 10 - sharpness = IS_SHARP_ACCURATE + sharpness = SHARP_POINTY attack_verb = list("stabbed", "poked", "slashed") hitsound = 'sound/weapons/bladeslice.ogg' w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index f305d5b678..35151953a0 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -53,7 +53,7 @@ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' flags_1 = CONDUCT_1 - sharpness = IS_SHARP + sharpness = SHARP_EDGED w_class = WEIGHT_CLASS_BULKY force = 30 // whoever balanced this got beat in the head by a bible too many times good lord throwforce = 10 @@ -114,7 +114,7 @@ armour_penetration = 45 throw_speed = 1 throw_range = 3 - sharpness = IS_SHARP + sharpness = SHARP_EDGED light_color = "#ff0000" attack_verb = list("cleaved", "slashed", "torn", "hacked", "ripped", "diced", "carved") icon_state = "cultbastard" @@ -708,7 +708,7 @@ armour_penetration = 30 block_chance = 30 attack_verb = list("attacked", "impaled", "stabbed", "torn", "gored") - sharpness = IS_SHARP + sharpness = SHARP_EDGED hitsound = 'sound/weapons/bladeslice.ogg' var/datum/action/innate/cult/spear/spear_act var/wielded = FALSE // track wielded status on item diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 35a674fb0e..3ae9cfcfb0 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -38,7 +38,7 @@ melee_damage_upper = 22.5 wound_bonus = -10 bare_wound_bonus = 0 - sharpness = TRUE + sharpness = SHARP_EDGED see_in_dark = 8 blood_volume = 0 //No bleeding on getting shot, for skeddadles lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 2701a2d006..d8a8e9a1be 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -259,7 +259,7 @@ to_chat(target, "You suddenly feel very hot") target.adjust_bodytemperature(50) GiveHint(target) - else if(is_pointed(I)) + else if(I.get_sharpness() == SHARP_POINTY) to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!") target.DefaultCombatKnockdown(40) GiveHint(target) diff --git a/code/modules/cargo/packs/goodies.dm b/code/modules/cargo/packs/goodies.dm index 2ff02d0473..86a7c73a34 100644 --- a/code/modules/cargo/packs/goodies.dm +++ b/code/modules/cargo/packs/goodies.dm @@ -81,3 +81,9 @@ desc = "Contains one hellgun, an old pattern of laser gun infamous for its ability to horribly disfigure targets with burns. Technically violates the Space Geneva Convention when used on humanoids." cost = 1500 contains = list(/obj/item/gun/energy/laser/hellgun) + +/datum/supply_pack/goody/medipen_twopak + name = "Medipen Two-Pak" + desc = "Contains one standard epinephrine medipen and one standard emergency first-aid kit medipen. For when you want to prepare for the worst." + cost = 500 + contains = list(/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/hypospray/medipen/ekit) diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index 5eacc2f583..6a4165f840 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -218,3 +218,18 @@ /obj/item/storage/box/beakers) crate_name = "virus containment unit crate" crate_type = /obj/structure/closet/crate/secure/plasma + +/datum/supply_pack/medical/medipen_variety + name = "Medipen Variety-Pak" + desc = "Contains eight different medipens in three different varieties, to assist in quickly treating seriously injured patients." + cost = 2000 + contains = list(/obj/item/reagent_containers/hypospray/medipen/, + /obj/item/reagent_containers/hypospray/medipen/, + /obj/item/reagent_containers/hypospray/medipen/ekit, + /obj/item/reagent_containers/hypospray/medipen/ekit, + /obj/item/reagent_containers/hypospray/medipen/ekit, + /obj/item/reagent_containers/hypospray/medipen/blood_loss, + /obj/item/reagent_containers/hypospray/medipen/blood_loss, + /obj/item/reagent_containers/hypospray/medipen/blood_loss) + + crate_name = "medipen crate" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 85c9b0f265..739a5fa243 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -832,7 +832,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Socks Color:     Change
" dat += "Backpack:[backbag]" dat += "Jumpsuit:
[jumpsuit_style]
" - if(CAN_SCAR in pref_species.species_traits) + if((HAS_FLESH in pref_species.species_traits) || (HAS_BONE in pref_species.species_traits)) dat += "
Temporal Scarring:
[(persistent_scars) ? "Enabled" : "Disabled"]" dat += "Clear scar slots" dat += "Uplink Location:[uplink_spawn_loc]" @@ -2800,6 +2800,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(custom_tongue != "default") var/new_tongue = GLOB.roundstart_tongues[custom_tongue] if(new_tongue) + character.dna.species.mutanttongue = new_tongue //this means we get our tongue when we clone var/obj/item/organ/tongue/T = character.getorganslot(ORGAN_SLOT_TONGUE) if(T) qdel(T) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 01effea6f2..350a577fb1 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -96,7 +96,7 @@ throw_speed = 4 attack_verb = list("sliced") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/clothing/glasses/meson/eyepatch name = "eyepatch mesons" @@ -180,7 +180,7 @@ throw_speed = 4 attack_verb = list("sliced") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED vision_correction = 1 glass_colour_type = /datum/client_colour/glass_colour/lightgreen @@ -237,7 +237,7 @@ throw_speed = 4 attack_verb = list("sliced") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/clothing/glasses/sunglasses/garb/supergarb name = "black giga gar glasses" @@ -257,7 +257,7 @@ throw_speed = 4 attack_verb = list("sliced") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED glass_colour_type = /datum/client_colour/glass_colour/orange /obj/item/clothing/glasses/sunglasses/gar/supergar diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index c745cd74f0..9ca98b0bca 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -70,7 +70,7 @@ flash_protect = -2 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE glass_colour_type = /datum/client_colour/glass_colour/green - + /obj/item/clothing/glasses/hud/health/night/syndicate name = "combat night vision health scanner HUD" desc = "An advanced shielded medical heads-up display that allows soldiers to approximate how much lead poisoning their allies have suffered in complete darkness." @@ -221,7 +221,7 @@ throw_speed = 4 attack_verb = list("sliced") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars name = "giga HUD gar glasses" diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 82dd3142ed..cba27845f1 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -7,7 +7,7 @@ clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS item_state = "spaceold" permeability_coefficient = 0.01 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 70) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 70, "wound" = 5) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT dynamic_hair_suffix = "" dynamic_fhair_suffix = "" @@ -36,7 +36,7 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/flashlight, /obj/item/tank/internals) slowdown = 1 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 70) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 70, "wound" = 5) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAUR cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index 4dc6fd1f6c..3f77a2befc 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -4,7 +4,7 @@ icon_state = "chronohelmet" item_state = "chronohelmet" slowdown = 1 - armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 60, "bomb" = 30, "bio" = 90, "rad" = 90, "fire" = 100, "acid" = 100) + armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 60, "bomb" = 30, "bio" = 90, "rad" = 90, "fire" = 100, "acid" = 100, "wound" = 80) resistance_flags = FIRE_PROOF | ACID_PROOF var/obj/item/clothing/suit/space/chronos/suit = null @@ -19,7 +19,7 @@ icon_state = "chronosuit" item_state = "chronosuit" actions_types = list(/datum/action/item_action/toggle) - armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 60, "bomb" = 30, "bio" = 90, "rad" = 90, "fire" = 100, "acid" = 1000) + armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 60, "bomb" = 30, "bio" = 90, "rad" = 90, "fire" = 100, "acid" = 1000, "wound" = 80) resistance_flags = FIRE_PROOF | ACID_PROOF mutantrace_variation = STYLE_DIGITIGRADE var/list/chronosafe_items = list(/obj/item/chrono_eraser, /obj/item/gun/energy/chrono_gun) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index b588deaf01..40797b97ed 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -5,7 +5,7 @@ icon_state = "hardsuit0-engineering" item_state = "eng_helm" max_integrity = 300 - armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75) + armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75, "wound" = 10) var/basestate = "hardsuit" var/brightness_on = 4 //luminosity when on var/on = FALSE @@ -717,7 +717,7 @@ item_state = "rig0-soviet" hardsuit_type = "soviet" icon_state = "rig0-soviet" - armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 15, "bomb" = 35, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 75) + armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 15, "bomb" = 35, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 75, "wound" = 15) mutantrace_variation = NONE /obj/item/clothing/suit/space/hardsuit/soviet @@ -726,7 +726,7 @@ item_state = "rig-soviet" icon_state = "rig-soviet" slowdown = 0.8 - armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 15, "bomb" = 35, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 75) + armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 15, "bomb" = 35, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 75, "wound" = 15) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/soviet mutantrace_variation = NONE @@ -771,7 +771,7 @@ item_state = "ert_medical" hardsuit_type = "ert_medical" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/ctf - armor = list("melee" = 0, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 95, "acid" = 95) + armor = list("melee" = 0, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 95, "acid" = 95, "wound" = 30) slowdown = 0 max_charges = 5 @@ -800,7 +800,7 @@ icon_state = "hardsuit0-ert_medical" item_state = "hardsuit0-ert_medical" hardsuit_type = "ert_medical" - armor = list("melee" = 0, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 95, "acid" = 95) + armor = list("melee" = 0, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 95, "acid" = 95, "wound" = 30) /obj/item/clothing/head/helmet/space/hardsuit/shielded/ctf/red icon_state = "hardsuit0-ert_security" @@ -879,7 +879,7 @@ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | LAVA_PROOF heat_protection = HEAD - armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 50, bio = 100, rad = 50, fire = 100, acid = 100) + armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 50, bio = 100, rad = 50, fire = 100, acid = 100, "wound" = 30) brightness_on = 7 allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator) var/energy_color = "#35FFF0" @@ -923,7 +923,7 @@ item_state = "swat_suit" max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | LAVA_PROOF - armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 50, bio = 100, rad = 50, fire = 100, acid = 100) + armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 50, bio = 100, rad = 50, fire = 100, acid = 100, "wound" = 30) allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/lavaknight heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index ee70f54ed0..5124c5d62e 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -51,7 +51,7 @@ Contains: icon_state = "heavy" item_state = "swat_suit" allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat) - armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100) + armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100, "wound" = 25) strip_delay = 120 resistance_flags = FIRE_PROOF | ACID_PROOF mutantrace_variation = STYLE_DIGITIGRADE @@ -63,7 +63,7 @@ Contains: dynamic_hair_suffix = "+generic" dynamic_fhair_suffix = "+generic" flags_inv = 0 - armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) + armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "wound" = 30) strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF @@ -79,7 +79,7 @@ Contains: flags_inv = 0 w_class = WEIGHT_CLASS_NORMAL allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals) - armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) + armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "wound" = 30) strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF @@ -140,7 +140,7 @@ Contains: desc = "A thick, space-proof tricorne from the royal Space Queen. It's lined with a layer of reflective kevlar." icon_state = "pirate" item_state = "pirate" - armor = list("melee" = 30, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 60, "acid" = 75) + armor = list("melee" = 30, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 60, "acid" = 75, "wound" = 30) flags_inv = HIDEHAIR strip_delay = 40 equip_delay_other = 20 @@ -163,7 +163,7 @@ Contains: flags_inv = 0 allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum) slowdown = 0 - armor = list("melee" = 30, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 60, "acid" = 75) + armor = list("melee" = 30, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 60, "acid" = 75, "wound" = 30) strip_delay = 40 equip_delay_other = 20 mutantrace_variation = STYLE_DIGITIGRADE @@ -175,7 +175,7 @@ Contains: icon_state = "hardsuit0-ert_commander" item_state = "hardsuit0-ert_commander" hardsuit_type = "ert_commander" - armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80) + armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80, "wound" = 30) strip_delay = 130 brightness_on = 7 resistance_flags = ACID_PROOF @@ -191,7 +191,7 @@ Contains: item_state = "ert_command" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals) - armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80) + armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80, "wound" = 30) slowdown = 0 strip_delay = 130 resistance_flags = ACID_PROOF @@ -244,7 +244,7 @@ Contains: icon_state = "hardsuit0-ert_commander-alert" item_state = "hardsuit0-ert_commander-alert" hardsuit_type = "ert_commander-alert" - armor = list("melee" = 70, "bullet" = 55, "laser" = 50, "energy" = 50, "bomb" = 65, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) + armor = list("melee" = 70, "bullet" = 55, "laser" = 50, "energy" = 50, "bomb" = 65, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "wound" = 50) brightness_on = 8 resistance_flags = FIRE_PROOF | ACID_PROOF @@ -254,7 +254,7 @@ Contains: icon_state = "ert_command-alert" item_state = "ert_command-alert" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/alert - armor = list("melee" = 70, "bullet" = 55, "laser" = 50, "energy" = 50, "bomb" = 65, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) + armor = list("melee" = 70, "bullet" = 55, "laser" = 50, "energy" = 50, "bomb" = 65, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "wound" = 50) resistance_flags = FIRE_PROOF | ACID_PROOF mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC @@ -303,7 +303,7 @@ Contains: icon_state = "space" item_state = "s_suit" desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies." - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 65) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 65, "wound" = 10) /obj/item/clothing/head/helmet/space/eva name = "EVA helmet" @@ -311,7 +311,7 @@ Contains: item_state = "space" desc = "A lightweight space helmet with the basic ability to protect the wearer from the vacuum of space during emergencies." flash_protect = 0 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 65) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 65, "wound" = 10) //Radiation /obj/item/clothing/head/helmet/space/rad @@ -319,7 +319,7 @@ Contains: desc = "A special helmet that protects against radiation and space. Not much else unfortunately." icon_state = "cespace_helmet" item_state = "nothing" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0, "wound" = 5) resistance_flags = FIRE_PROOF rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE actions_types = list() @@ -329,7 +329,7 @@ Contains: desc = "A special suit that protects against radiation and space. Not much else unfortunately." icon_state = "hardsuit-rad" item_state = "nothing" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0, "wound" = 5) resistance_flags = FIRE_PROOF rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE mutantrace_variation = NONE @@ -339,7 +339,7 @@ Contains: desc = "An advanced, space-proof helmet. It appears to be modeled after an old-world eagle." icon_state = "griffinhat" item_state = "griffinhat" - armor = list("melee" = 20, "bullet" = 40, "laser" = 30, "energy" = 25, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80) + armor = list("melee" = 20, "bullet" = 40, "laser" = 30, "energy" = 25, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80, "wound" = 20) strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = ACID_PROOF | FIRE_PROOF @@ -351,7 +351,7 @@ Contains: icon_state = "freedom" item_state = "freedom" allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals) - armor = list("melee" = 20, "bullet" = 40, "laser" = 30,"energy" = 25, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80) + armor = list("melee" = 20, "bullet" = 40, "laser" = 30,"energy" = 25, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80, "wound" = 20) strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = ACID_PROOF | FIRE_PROOF @@ -364,7 +364,7 @@ Contains: desc = "Spaceworthy and it looks like a space carp's head, smells like one too." icon_state = "carp_helm" item_state = "syndicate" - armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 75) //As whimpy as a space carp + armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 75, "wound" = 5) //As whimpy as a space carp brightness_on = 0 //luminosity when on actions_types = list() mutantrace_variation = NONE @@ -380,7 +380,7 @@ Contains: icon_state = "carp_suit" item_state = "space_suit_syndicate" slowdown = 0 //Space carp magic, never stop believing - armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 75) //As whimpy whimpy whoo + armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 75, "wound" = 5) //As whimpy whimpy whoo allowed = list(/obj/item/tank/internals, /obj/item/gun/ballistic/automatic/speargun) //I'm giving you a hint here helmettype = /obj/item/clothing/head/helmet/space/hardsuit/carp mutantrace_variation = STYLE_DIGITIGRADE @@ -442,14 +442,14 @@ Contains: /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old desc = "Powerful wards are built into this hardsuit, protecting the user from all manner of paranormal threats. Alas, this one looks pretty worn out and rusted." - armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60) + armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60, "wound" = 20) slowdown = 0.8 helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor/old charges = 12 /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor/old desc = "A helmet worn by those who deal with paranormal threats for a living. Alas, this one looks pretty worn out and rusted." - armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60) + armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60, "wound" = 20) charges = 12 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker @@ -467,14 +467,14 @@ Contains: /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old desc = "Voices echo from the hardsuit, driving the user insane. This one is pretty battle-worn, but still fearsome." - armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60) + armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60, "wound" = 20) slowdown = 0.8 helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/beserker/old charges = 6 /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/beserker/old desc = "Peering into the eyes of the helmet is enough to seal damnation. This one is pretty battle-worn, but still fearsome." - armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60) + armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60, "wound" = 20) charges = 6 /obj/item/clothing/head/helmet/space/fragile @@ -482,7 +482,7 @@ Contains: desc = "A bulky, air-tight helmet meant to protect the user during emergency situations. It doesn't look very durable." icon_state = "syndicate-helm-orange" item_state = "syndicate-helm-orange" - armor = list("melee" = 5, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 0, "acid" = 0) + armor = list("melee" = 5, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 0, "acid" = 0, "wound" = 5) strip_delay = 65 /obj/item/clothing/suit/space/fragile @@ -492,7 +492,7 @@ Contains: icon_state = "syndicate-orange" item_state = "syndicate-orange" slowdown = 2 - armor = list("melee" = 5, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 0, "acid" = 0) + armor = list("melee" = 5, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 0, "acid" = 0, "wound" = 5) strip_delay = 65 /obj/item/clothing/suit/space/fragile/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) @@ -525,7 +525,7 @@ Contains: icon_state = "hunter" item_state = "swat_suit" allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat) - armor = list("melee" = 60, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) + armor = list("melee" = 60, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "wpound" = 25) strip_delay = 130 resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index f17eb91b74..5128f77433 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -5,7 +5,7 @@ name = "EVA plasma envirosuit" desc = "A special plasma containment suit designed to be space-worthy, as well as worn over other clothing. Like its smaller counterpart, it can automatically extinguish the wearer in a crisis, and holds twice as many charges." allowed = list(/obj/item/gun, /obj/item/ammo_casing, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank) - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75, "wound" = 10) resistance_flags = FIRE_PROOF icon_state = "plasmaman_suit" item_state = "plasmaman_suit" @@ -40,7 +40,7 @@ icon_state = "plasmaman-helm" item_state = "plasmaman-helm" strip_delay = 80 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75, "wound" = 10) resistance_flags = FIRE_PROOF var/brightness_on = 4 //luminosity when the light is on var/on = FALSE @@ -77,7 +77,7 @@ desc = "A plasmaman containment helmet designed for security officers, protecting them from being flashed and burning alive, along-side other undesirables." icon_state = "security_envirohelm" item_state = "security_envirohelm" - armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75, "wound" = 20) /obj/item/clothing/head/helmet/space/plasmaman/security/warden name = "warden's plasma envirosuit helmet" @@ -132,7 +132,7 @@ desc = "A sturdier plasmaman envirohelmet designed for research directors." icon_state = "rd_envirohelm" item_state = "rd_envirohelm" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75, "wound" = 10) /obj/item/clothing/head/helmet/space/plasmaman/robotics name = "robotics plasma envirosuit helmet" @@ -145,7 +145,7 @@ desc = "A space-worthy helmet specially designed for engineer plasmamen, the usual purple stripes being replaced by engineering's orange." icon_state = "engineer_envirohelm" item_state = "engineer_envirohelm" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 10, "fire" = 100, "acid" = 75) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 10, "fire" = 100, "acid" = 75, "wound" = 10) /obj/item/clothing/head/helmet/space/plasmaman/engineering/ce name = "chief engineer's plasma envirosuit helmet" @@ -194,7 +194,7 @@ desc = "A blue and gold envirohelm designed for the station's captain, nonetheless. Made of superior materials to protect them from the station hazards and more." icon_state = "captain_envirohelm" item_state = "captain_envirohelm" - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 10, "fire" = 100, "acid" = 85) + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 10, "fire" = 100, "acid" = 85, "wound" = 15) /obj/item/clothing/head/helmet/space/plasmaman/curator name = "curator's plasma envirosuit helmet" diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index 662e333f59..f55379da2f 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -4,7 +4,7 @@ icon_state = "syndicate" item_state = "syndicate" desc = "Has a tag on it: Totally not property of an enemy corporation, honest!" - armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85) + armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85, "wound" = 20) /obj/item/clothing/suit/space/syndicate name = "red space suit" @@ -13,7 +13,7 @@ desc = "Has a tag on it: Totally not property of an enemy corporation, honest!" w_class = WEIGHT_CLASS_NORMAL allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals) - armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85) + armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85, "wound" = 20) mutantrace_variation = STYLE_DIGITIGRADE //Green syndicate space suit diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index b61743729f..cf7dbc7462 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -8,7 +8,7 @@ equip_delay_other = 40 max_integrity = 250 resistance_flags = NONE - armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 15) + armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 10) /obj/item/clothing/suit/armor/Initialize() @@ -58,7 +58,7 @@ icon_state = "hos" item_state = "greatcoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS - armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90, "wound" = 20) + armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90, "wound" = 10) cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS strip_delay = 80 @@ -148,7 +148,7 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - armor = list("melee" = 50, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80, "wound" = 30) + armor = list("melee" = 50, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80, "wound" = 20) blocks_shove_knockdown = TRUE strip_delay = 80 equip_delay_other = 60 diff --git a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm index 5928819b16..082d783bea 100644 --- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm +++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm @@ -57,7 +57,7 @@ desc = "An expensive piece of plasmaman envirosuit fashion. guaranteed to keep you cool while the station goes down in fierceful fires." icon_state = "captain_envirosuit" item_state = "captain_envirosuit" - armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95) + armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95, "wound" = 15) sensor_mode = SENSOR_COORDS random_sensor = FALSE diff --git a/code/modules/clothing/under/jobs/Plasmaman/engineering.dm b/code/modules/clothing/under/jobs/Plasmaman/engineering.dm index 15eb189fa8..4850a605e7 100644 --- a/code/modules/clothing/under/jobs/Plasmaman/engineering.dm +++ b/code/modules/clothing/under/jobs/Plasmaman/engineering.dm @@ -3,7 +3,7 @@ desc = "An air-tight suit designed to be used by plasmamen exployed as engineers, the usual purple stripes being replaced by engineer's orange. It protects the user from fire and acid damage." icon_state = "engineer_envirosuit" item_state = "engineer_envirosuit" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 10, "fire" = 95, "acid" = 95) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 10, "fire" = 95, "acid" = 95, "wound" = 5) /obj/item/clothing/under/plasmaman/engineering/ce name = "chief engineer's plasma envirosuit" diff --git a/code/modules/clothing/under/jobs/Plasmaman/medsci.dm b/code/modules/clothing/under/jobs/Plasmaman/medsci.dm index 03d089c10d..52f817dcce 100644 --- a/code/modules/clothing/under/jobs/Plasmaman/medsci.dm +++ b/code/modules/clothing/under/jobs/Plasmaman/medsci.dm @@ -21,7 +21,7 @@ desc = "A plasmaman envirosuit designed for the research director to aid them in their job of directing research into the right direction." icon_state = "rd_envirosuit" item_state = "rd_envirosuit" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95, "wound" = 5) /obj/item/clothing/under/plasmaman/robotics name = "robotics plasma envirosuit" diff --git a/code/modules/clothing/under/jobs/Plasmaman/security.dm b/code/modules/clothing/under/jobs/Plasmaman/security.dm index ddbda041f3..3330d72844 100644 --- a/code/modules/clothing/under/jobs/Plasmaman/security.dm +++ b/code/modules/clothing/under/jobs/Plasmaman/security.dm @@ -3,7 +3,7 @@ desc = "A plasmaman containment suit designed for security officers, offering a limited amount of extra protection." icon_state = "security_envirosuit" item_state = "security_envirosuit" - armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95) + armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95, "wound" = 10) sensor_mode = SENSOR_COORDS random_sensor = FALSE diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm index 4eb6a18258..5dffc8f88d 100644 --- a/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -110,7 +110,7 @@ desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." name = "janitor's jumpsuit" icon_state = "janitor" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) /obj/item/clothing/under/rank/civilian/janitor/skirt name = "janitor's jumpskirt" diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index 3eaaa42620..5693468b3b 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -4,7 +4,7 @@ name = "chief engineer's jumpsuit" icon_state = "chiefengineer" item_state = "gy_suit" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 80, "acid" = 40) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 80, "acid" = 40, "wound" = 5) resistance_flags = NONE /obj/item/clothing/under/rank/engineering/chief_engineer/skirt @@ -39,7 +39,7 @@ name = "engineer's jumpsuit" icon_state = "engine" item_state = "engi_suit" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 60, "acid" = 20) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 5) resistance_flags = NONE /obj/item/clothing/under/rank/engineering/engineer/hazard diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index c4eedf93a4..c66b972624 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -4,7 +4,7 @@ icon_state = "cmo" item_state = "w_suit" permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt name = "chief medical officer's jumpskirt" @@ -30,7 +30,7 @@ icon_state = "genetics" item_state = "w_suit" permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) /obj/item/clothing/under/rank/medical/geneticist/skirt name = "geneticist's jumpskirt" @@ -48,7 +48,7 @@ icon_state = "virology" item_state = "w_suit" permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) /obj/item/clothing/under/rank/medical/virologist/skirt name = "virologist's jumpskirt" @@ -66,7 +66,7 @@ icon_state = "chemistry" item_state = "w_suit" permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65, "wound" = 5) /obj/item/clothing/under/rank/medical/chemist/skirt name = "chemist's jumpskirt" @@ -84,7 +84,7 @@ icon_state = "paramedic-dark" item_state = "w_suit" permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) /obj/item/clothing/under/rank/medical/paramedic/light desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic." @@ -110,7 +110,7 @@ icon_state = "nursesuit" item_state = "w_suit" permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) body_parts_covered = CHEST|GROIN|ARMS fitted = NO_FEMALE_UNIFORM can_adjust = FALSE @@ -122,7 +122,7 @@ icon_state = "medical" item_state = "w_suit" permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) /obj/item/clothing/under/rank/medical/doctor/blue name = "blue medical scrubs" diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm index f7bd6d5e33..03eb910736 100644 --- a/code/modules/clothing/under/jobs/rnd.dm +++ b/code/modules/clothing/under/jobs/rnd.dm @@ -3,7 +3,7 @@ name = "research director's vest suit" icon_state = "director" item_state = "lb_suit" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 35) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 35, "wound" = 5) can_adjust = FALSE /obj/item/clothing/under/rank/rnd/research_director/skirt @@ -20,7 +20,7 @@ name = "research director's tan suit" icon_state = "rdwhimsy" item_state = "rdwhimsy" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) can_adjust = TRUE alt_covers_chest = TRUE @@ -39,7 +39,7 @@ name = "research director's turtleneck" icon_state = "rdturtle" item_state = "p_suit" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) can_adjust = TRUE alt_covers_chest = TRUE @@ -59,7 +59,7 @@ icon_state = "toxins" item_state = "w_suit" permeability_coefficient = 0.5 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) /obj/item/clothing/under/rank/rnd/scientist/skirt name = "scientist's jumpskirt" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 997f10a379..bc38cb6664 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -66,7 +66,7 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - armor = list("melee" = 100, "bullet" = 100, "laser" = 100,"energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) + armor = list("melee" = 100, "bullet" = 100, "laser" = 100,"energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "wound" = 1000) //wound defense at 100 wont stop wounds cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 6a6c38d26e..72af4e9572 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -4,7 +4,7 @@ icon_state = "syndicate" item_state = "bl_suit" has_sensor = NO_SENSORS - armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40, "wound" = 5) alt_covers_chest = TRUE /obj/item/clothing/under/syndicate/skirt @@ -13,7 +13,7 @@ icon_state = "syndicate_skirt" item_state = "bl_suit" has_sensor = NO_SENSORS - armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40, "wound" = 5) alt_covers_chest = TRUE fitted = FEMALE_UNIFORM_TOP mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON @@ -24,7 +24,7 @@ icon_state = "bloodred_pajamas" item_state = "bl_suit" dummy_thick = TRUE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 50, "acid" = 40) + armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 50, "acid" = 40, "wound" = 10) resistance_flags = FIRE_PROOF | ACID_PROOF can_adjust = FALSE @@ -33,21 +33,21 @@ desc = "Do operatives dream of nuclear sheep?" icon_state = "bloodred_pajamas" item_state = "bl_suit" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40, "wound" = 5) /obj/item/clothing/under/syndicate/tacticool name = "tacticool turtleneck" desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-." icon_state = "tactifool" item_state = "bl_suit" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40, "wound" = 5) /obj/item/clothing/under/syndicate/tacticool/skirt name = "tacticool skirtleneck" desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-." icon_state = "tactifool_skirt" item_state = "bl_suit" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40, "wound" = 5) fitted = FEMALE_UNIFORM_TOP mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON @@ -57,7 +57,7 @@ icon_state = "tactifool" item_state = "bl_suit" has_sensor = TRUE - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) /obj/item/clothing/under/syndicate/sniper name = "Tactical turtleneck suit" @@ -81,7 +81,7 @@ desc = "Badly translated labels tell you to clean this in Vodka. Great for squatting in." icon_state = "trackpants" can_adjust = FALSE - armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) resistance_flags = NONE /obj/item/clothing/under/syndicate/combat @@ -96,7 +96,7 @@ desc = "Military grade tracksuits for frontline squatting." icon_state = "rus_under" can_adjust = FALSE - armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5) resistance_flags = NONE mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON @@ -106,7 +106,7 @@ icon_state = "syndicatebaseball" item_state = "syndicatebaseball" has_sensor = NO_SENSORS - armor = list("melee" = 15, "bullet" = 5, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) + armor = list("melee" = 15, "bullet" = 5, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40, "wound" = 10) alt_covers_chest = TRUE mutantrace_variation = USE_TAUR_CLIP_MASK diff --git a/code/modules/events/travelling_trader.dm b/code/modules/events/travelling_trader.dm index 08dae1b469..c7b982eda8 100644 --- a/code/modules/events/travelling_trader.dm +++ b/code/modules/events/travelling_trader.dm @@ -1,8 +1,8 @@ /datum/round_event_control/travelling_trader name = "Travelling Trader" typepath = /datum/round_event/travelling_trader - weight = 10 - max_occurrences = 3 + weight = 8 + max_occurrences = 2 earliest_start = 0 MINUTES /datum/round_event/travelling_trader @@ -52,6 +52,14 @@ var/acceptance_speech = "This is exactly what I wanted! I shall be on my way now, thank you.!" var/refusal_speech = "A given_item? I wanted a requested_item!" //what they say when refusing an item var/active = TRUE + var/examine_text = list("You attempt to look directly at the being's face, but it's just a blur!") + move_resist = MOVE_FORCE_VERY_STRONG + mob_size = MOB_SIZE_LARGE + alpha = 200 + +/mob/living/carbon/human/dummy/travelling_trader/examine(mob/user) + SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, examine_text) + return examine_text /mob/living/carbon/human/dummy/travelling_trader/proc/setup_speech(var/input_speech, var/obj/item/given_item) if(requested_item) @@ -92,6 +100,8 @@ /mob/living/carbon/human/dummy/travelling_trader/Initialize() ..() + add_atom_colour("#570d6b", FIXED_COLOUR_PRIORITY) //make them purple (otherworldly!) + set_light(1, -0.7, "#AAD84B") ADD_TRAIT(src,TRAIT_PIERCEIMMUNE, "trader_pierce_immune") //don't let people take their blood equipOutfit(trader_outfit, TRUE) for(var/obj/item/item in src.get_equipped_items()) @@ -159,15 +169,11 @@ trader_name = "Otherworldly Animal Specialist" trader_outfit = /datum/outfit/job/doctor initial_speech = "Greetings, lifeform. I am here to locate a special creature aboard your station." - request_speech = "Find me the creature known as 'requested_item' and you shall be rewarded for your efforts." + request_speech = "Find me the creature known as 'requested_item' and hand it to me, preferably in a suitable container." refusal_speech = "Do you think me to be a fool, lifeform? I know a requested_item when I see one." - possible_wanted_items = list(/mob/living/simple_animal/pet/dog/corgi/Ian = 1, - /mob/living/simple_animal/sloth/paperwork = 1, - /mob/living/carbon/monkey/punpun = 1, - /mob/living/simple_animal/pet/fox/Renault = 1, - /mob/living/simple_animal/hostile/carp/cayenne = 1, - /mob/living/simple_animal/pet/bumbles = 1, - /mob/living/simple_animal/parrot/Poly = 1) + possible_wanted_items = list(/mob/living/simple_animal/pet/dog/corgi = 4, + /mob/living/carbon/monkey = 1, + /mob/living/simple_animal/mouse = 2) possible_rewards = list(/mob/living/simple_animal/pet/dog/corgi/exoticcorgi = 1, //rewards are animals, friendly to only the person who handed the reward in! /mob/living/simple_animal/cockroach = 1, /mob/living/simple_animal/hostile/skeleton = 1, @@ -184,13 +190,6 @@ mob/living/carbon/human/dummy/travelling_trader/animal_hunter/Initialize() acceptance_speech = pick(list("This lifeform shall make for a great stew, thank you.", "This lifeform shall be of a true use to our cause, thank you.", "The lifeform is adequate. Goodbye.", "This lifeform shall make a great addition to my collection.")) - //make sure they only ask for animals that are still alive - for(var/mob/living/animal in possible_wanted_items) - if(!(animal in GLOB.mob_living_list)) - possible_wanted_items -= animal - if(!possible_wanted_items) - //all the pets are dead, so ask for a monkey, or sometimes a corgi (corgis are more annoying to get a hold of) - possible_wanted_items = list(/mob/living/simple_animal/pet/dog/corgi = 1, /mob/living/carbon/monkey = 3) ..() /mob/living/carbon/human/dummy/travelling_trader/animal_hunter/check_item(var/obj/item/supplied_item) //item is likely to be in contents of whats supplied diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 45ab6f6af1..a3ee8c5228 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -299,6 +299,31 @@ desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." list_reagents = list(/datum/reagent/consumable/tea = 30) +/obj/item/reagent_containers/food/drinks/mug/tea/red + name = "Dutchess Red tea" + icon_state = "tea" + desc = "Duchess Red's personal blend of red tea leaves and hot water. Great addition to any meal." + list_reagents = list(/datum/reagent/consumable/tea/red = 30) + +/obj/item/reagent_containers/food/drinks/mug/tea/green + name = "Prince Green tea" + icon_state = "tea" + desc = "Prince Green's brew of tea. The blend may be different from time to time, but Prince Green swears by it!" + list_reagents = list(/datum/reagent/consumable/tea/green = 30) + +/obj/item/reagent_containers/food/drinks/mug/tea/forest + name = "Royal Forest tea" + icon_state = "tea" + desc = "Tea fit for anyone with a sweet tooth like Royal Forest." + list_reagents = list(/datum/reagent/consumable/tea/forest = 30) + +/obj/item/reagent_containers/food/drinks/mug/tea/mush + name = "Rebel Mush tea" + icon_state = "tea" + desc = "Rebel Mush, a hallucinogenic tea to help people find their inner self." + list_reagents = list(/datum/reagent/consumable/tea/mush = 30) + + /obj/item/reagent_containers/food/drinks/mug/coco name = "Dutch hot coco" desc = "Made in Space South America." diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index d87eb8fbc0..e31a9704df 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -87,7 +87,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("stabbed", "slashed", "attacked") var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/broken_bottle/Initialize() . = ..() diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 4b79dc1fd4..895699434a 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -249,21 +249,9 @@ All foods are distributed among various categories. Use common sense. to_chat(user, "You cannot slice [src] here! You need a table or at least a tray.") return FALSE - var/slices_lost = 0 - if (accuracy >= IS_SHARP_ACCURATE) - user.visible_message( \ - "[user] slices [src].", \ - "You slice [src]." \ - ) - else - user.visible_message( \ - "[user] inaccurately slices [src] with [W]!", \ - "You inaccurately slice [src] with your [W]!" \ - ) - slices_lost = rand(1,min(1,round(slices_num/2))) - + user.visible_message("[user] slices [src].", "You slice [src].") var/reagents_per_slice = reagents.total_volume/slices_num - for(var/i=1 to (slices_num-slices_lost)) + for(var/i=1 to slices_num) var/obj/item/reagent_containers/food/snacks/slice = new slice_path (loc) initialize_slice(slice, reagents_per_slice) qdel(src) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index c1a17b87a4..972f9a8cc3 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -18,12 +18,6 @@ results = list(/datum/reagent/consumable/ethanol/bilk = 2) required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ethanol/beer = 1) -/datum/chemical_reaction/icetea - name = "Iced Tea" - id = /datum/reagent/consumable/icetea - results = list(/datum/reagent/consumable/icetea = 4) - required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/tea = 3) - /datum/chemical_reaction/icecoffee name = "Iced Coffee" id = /datum/reagent/consumable/icecoffee @@ -581,13 +575,6 @@ required_reagents = list(/datum/reagent/consumable/lemonjuice = 2, /datum/reagent/water = 2, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/ice = 1) mix_message = "You're suddenly reminded of home." -/datum/chemical_reaction/arnold_palmer - name = "Arnold Palmer" - id = /datum/reagent/consumable/tea/arnold_palmer - results = list(/datum/reagent/consumable/tea/arnold_palmer = 2) - required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/lemonade = 1) - mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange." - /datum/chemical_reaction/chocolate_milk name = "chocolate milk" id = /datum/reagent/consumable/milk/chocolate_milk @@ -756,12 +743,6 @@ results = list(/datum/reagent/consumable/pinkmilk = 2) required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/milk = 1) -/datum/chemical_reaction/pinktea - name = "Strawberry Tea" - id = /datum/reagent/consumable/pinktea - results = list(/datum/reagent/consumable/pinktea = 5) - required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1) - /datum/chemical_reaction/blank_paper name = "Blank Paper" id = /datum/reagent/consumable/ethanol/blank_paper @@ -903,12 +884,6 @@ results = list(/datum/reagent/consumable/ethanol/mauna_loa = 5) required_reagents = list(/datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/bahama_mama = 2) -/datum/chemical_reaction/catnip_tea - name = "Catnip Tea" - id = /datum/reagent/consumable/catnip_tea - results = list(/datum/reagent/consumable/catnip_tea = 3) - required_reagents = list(/datum/reagent/consumable/tea = 5, /datum/reagent/pax/catnip = 2) - /datum/chemical_reaction/commander_and_chief name = "Commander and Chief" id = /datum/reagent/consumable/ethanol/commander_and_chief @@ -916,6 +891,76 @@ required_reagents = list(/datum/reagent/consumable/ethanol/alliescocktail = 50, /datum/reagent/consumable/ethanol/champagne = 20, /datum/reagent/consumable/doctor_delight = 10, /datum/reagent/consumable/ethanol/quintuple_sec = 10, /datum/reagent/consumable/ethanol/screwdrivercocktail = 10) mix_message = "When your powers combine, I am Captain Pl-..." +////////////////////////////////////////// Tea Base Drinks ////////////////////////////////////// + +/datum/chemical_reaction/mush + name = "Mush Tea" + id = /datum/reagent/consumable/tea/mush + results = list(/datum/reagent/consumable/tea/mush = 3) + required_reagents = list(/datum/reagent/drug/mushroomhallucinogen = 3, /datum/reagent/consumable/tea = 3) + +/datum/chemical_reaction/foresttea1 + name = "Forest Tea" + id = /datum/reagent/consumable/tea/forest + results = list(/datum/reagent/consumable/tea/forest = 3) + required_reagents = list(/datum/reagent/consumable/buzz_fuzz= 3, /datum/reagent/consumable/tea = 3) + +/datum/chemical_reaction/foresttea2 + name = "Forest Tea" + id = /datum/reagent/consumable/tea/forest + results = list(/datum/reagent/consumable/tea/forest = 3) + required_reagents = list(/datum/reagent/consumable/honey = 1, /datum/reagent/consumable/tea = 3) + +/datum/chemical_reaction/redtea1 + name = "Red Tea" + id = /datum/reagent/consumable/tea/red + results = list(/datum/reagent/consumable/tea/red = 3) + required_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/red = 1, /datum/reagent/consumable/tea = 3) + +/datum/chemical_reaction/greentea1 + name = "Green Tea" + id = /datum/reagent/consumable/tea/green + results = list(/datum/reagent/consumable/tea/green = 3) + required_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/green = 1, /datum/reagent/consumable/tea = 3) + +/datum/chemical_reaction/redtea2 + name = "Red Tea" + id = /datum/reagent/consumable/tea/red + results = list(/datum/reagent/consumable/tea/red = 3) + required_reagents = list(/datum/reagent/toxin/teapowder/red = 1, /datum/reagent/water = 3) + +/datum/chemical_reaction/greentea2 + name = "Green Tea" + id = /datum/reagent/consumable/tea/green + results = list(/datum/reagent/consumable/tea/green = 3) + required_reagents = list(/datum/reagent/toxin/teapowder/green = 1, /datum/reagent/water = 3) + +/datum/chemical_reaction/arnold_palmer + name = "Arnold Palmer" + id = /datum/reagent/consumable/tea/arnold_palmer + results = list(/datum/reagent/consumable/tea/arnold_palmer = 2) + required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/lemonade = 1) + mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange." + +/datum/chemical_reaction/icetea + name = "Iced Tea" + id = /datum/reagent/consumable/icetea + results = list(/datum/reagent/consumable/icetea = 4) + required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/tea = 3) + +/datum/chemical_reaction/pinktea + name = "Strawberry Tea" + id = /datum/reagent/consumable/pinktea + results = list(/datum/reagent/consumable/pinktea = 5) + required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1) + +/datum/chemical_reaction/catnip_tea + name = "Catnip Tea" + id = /datum/reagent/consumable/catnip_tea + results = list(/datum/reagent/consumable/catnip_tea = 3) + required_reagents = list(/datum/reagent/consumable/tea = 5, /datum/reagent/pax/catnip = 2) + + ////////////////////////////////////////// Race Base Drinks ////////////////////////////////////// /datum/chemical_reaction/coldscales diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index 93c733391e..2669a3634a 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -303,7 +303,10 @@ h1.alert, h2.alert {color: #000000;} .passive {color: #660000;} .userdanger {color: #ff0000; font-weight: bold; font-size: 185%;} +.bolddanger {color: #c51e1e;font-weight: bold;} .danger {color: #ff0000;} +.tinydanger {color: #c51e1e; font-size: 85%;} +.smalldanger {color: #c51e1e; font-size: 90%;} .warning {color: #ff0000; font-style: italic;} .alertwarning {color: #FF0000; font-weight: bold} .boldwarning {color: #ff0000; font-style: italic; font-weight: bold} @@ -313,8 +316,9 @@ h1.alert, h2.alert {color: #000000;} .rose {color: #ff5050;} .info {color: #0000CC;} .notice {color: #000099;} -.tinynotice {color: #6685f5; font-style: italic; font-size: 85%;} -.smallnotice {color: #6685f5; font-style: italic; font-size: 90%;} +.tinynotice {color: #6685f5; font-style: italic; font-size: 85%;} +.smallnotice {color: #6685f5; font-size: 90%;} +.smallnoticeital {color: #6685f5; font-style: italic; font-size: 90%;} .boldnotice {color: #000099; font-weight: bold;} .adminnotice {color: #0000ff;} .adminhelp {color: #ff0000; font-weight: bold;} diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 0411a80443..81318f8fe1 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -27,6 +27,12 @@ juice_results = list(/datum/reagent/consumable/banana = 0) distill_reagent = /datum/reagent/consumable/ethanol/bananahonk +/obj/item/reagent_containers/food/snacks/grown/banana/generate_trash(atom/location) + . = ..() + var/obj/item/grown/bananapeel/peel = . + if(istype(peel)) + peel.grind_results = list(/datum/reagent/consumable/banana_peel = seed.potency * 0.2) + /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user) user.visible_message("[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!") playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 1f60afe655..001a90b441 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -81,7 +81,8 @@ wine_power = 50 /obj/item/reagent_containers/food/snacks/grown/ghost_chili/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) - if( ismob(loc) ) + . = ..() + if(ishuman(loc)) held_mob = loc START_PROCESSING(SSobj, src) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 9b5983c8e9..abf6632939 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -82,7 +82,7 @@ custom_materials = list(/datum/material/iron = 15000) attack_verb = list("chopped", "torn", "cut") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/hatchet/Initialize() . = ..() diff --git a/code/modules/instruments/songs/_song.dm b/code/modules/instruments/songs/_song.dm index 463398d2f2..d842dbc003 100644 --- a/code/modules/instruments/songs/_song.dm +++ b/code/modules/instruments/songs/_song.dm @@ -303,3 +303,19 @@ return TRUE var/obj/structure/musician/M = parent return M.should_stop_playing(user) + +/datum/song/holoparasite + var/mob/living/simple_animal/hostile/guardian/stand + +/datum/song/holoparasite/New(atom/parent, list/instrument_ids) + . = ..() + stand = istype(parent, /mob/living/simple_animal/hostile/guardian) && parent + +/datum/song/holoparasite/updateDialog() + stand.ui_interact(src) + +/datum/song/holoparasite/should_stop_playing(mob/user) + return FALSE + +/datum/song/holoparasite/check_can_use(mob/user) + return (user == stand) diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index d9595797d7..8c5171667a 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -109,8 +109,11 @@ linenum++ updateDialog(usr) // make sure updates when complete +/datum/song/proc/check_can_use(mob/user) + return user.canUseTopic(parent, TRUE, FALSE, FALSE, FALSE) + /datum/song/Topic(href, href_list) - if(!usr.canUseTopic(parent, TRUE, FALSE, FALSE, FALSE)) + if(!check_can_use(usr)) usr << browse(null, "window=instrument") usr.unset_machine() return diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 7c9f811c34..903ff13fa8 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -651,11 +651,6 @@ icon_state = "setup_small_pda" desc = "It's a case, for building small electronics with. This one resembles a PDA." -/obj/item/electronic_assembly/dildo - name = "type-g electronic assembly" - icon_state = "setup_dildo_medium" - desc = "It's a case, for building small electronics with. This one has a phallic design." - /obj/item/electronic_assembly/small name = "electronic device" icon_state = "setup_device" @@ -687,11 +682,6 @@ icon_state = "setup_device_box" desc = "It's a case, for building tiny-sized electronics with. This one has a boxy design." -/obj/item/electronic_assembly/small/dildo - name = "type-f electronic device" - icon_state = "setup_dildo_small" - desc = "It's a case, for building tiny-sized electronics with. This one has a phallic design." - /obj/item/electronic_assembly/medium name = "electronic mechanism" icon_state = "setup_medium" @@ -732,12 +722,6 @@ icon_state = "setup_medium_radio" desc = "It's a case, for building medium-sized electronics with. This one resembles an old radio." -/obj/item/electronic_assembly/medium/dildo - name = "type-g electronic mechanism" - icon_state = "setup_dildo_large" - desc = "It's a case, for building medium-sized electronics with. This one has a phallic design." - - /obj/item/electronic_assembly/large name = "electronic machine" icon_state = "setup_large" diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index e5afe7e1b3..463113f14c 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -23,7 +23,7 @@ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) display_order = JOB_DISPLAY_ORDER_DETECTIVE - blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/nonviolent, /datum/quirk/paraplegic) + blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/monophobia) threat = 1 /datum/outfit/job/detective diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 69ed63a514..3d7d07d894 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -31,7 +31,7 @@ paycheck_department = ACCOUNT_SEC display_order = JOB_DISPLAY_ORDER_HEAD_OF_SECURITY - blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/insanity) + blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia, /datum/quirk/insanity) threat = 3 /datum/outfit/job/hos diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index bc6f6a94c7..7e71b2d1f4 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -23,7 +23,7 @@ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) display_order = JOB_DISPLAY_ORDER_SECURITY_OFFICER - blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/nonviolent, /datum/quirk/paraplegic) + blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia) threat = 2 /datum/job/officer/get_access() diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 5762731f62..22e3f9b0f1 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -24,7 +24,7 @@ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) display_order = JOB_DISPLAY_ORDER_WARDEN - blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/nonviolent, /datum/quirk/paraplegic) + blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia) threat = 2 /datum/job/warden/get_access() diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm index 6e3d27f2b8..55e9352843 100644 --- a/code/modules/language/language_holder.dm +++ b/code/modules/language/language_holder.dm @@ -276,7 +276,8 @@ Key procs /datum/language/draconic = list(LANGUAGE_ATOM)) /datum/language_holder/lizard/ash - selected_language = /datum/language/draconic + understood_languages = list(/datum/language/draconic = list(LANGUAGE_ATOM)) + spoken_languages = list(/datum/language/draconic = list(LANGUAGE_ATOM)) /datum/language_holder/monkey understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 745c46b131..7a755265dc 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -17,7 +17,7 @@ custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075) hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("smashed", "crushed", "cleaved", "chopped", "pulped") - sharpness = IS_SHARP + sharpness = SHARP_EDGED actions_types = list(/datum/action/item_action/toggle_light) var/list/trophies = list() var/charged = TRUE @@ -175,6 +175,20 @@ if(light_on) . += "[icon_state]_lit" +/obj/item/kinetic_crusher/glaive + name = "proto-kinetic glaive" + desc = "A modified design of a proto-kinetic crusher, it is still little more of a combination of various mining tools cobbled together \ + and kit-bashed into a high-tech cleaver on a stick - with a handguard and a goliath hide grip. While it is still of little use to any \ + but the most skilled and/or suicidal miners against local fauna, it's an elegant weapon for a more civilized hunter." + attack_verb = list("stabbed", "diced", "sliced", "cleaved", "chopped", "lacerated", "cut", "jabbed", "punctured") + icon_state = "crusher-glaive" + item_state = "crusher0-glaive" + //ideas: altclick that lets you pummel people with the handguard/handle? + //parrying functionality? + +/obj/item/kinetic_crusher/glaive/update_icon_state() + item_state = "crusher[wielded]-glaive" // this is not icon_state and not supported by 2hcomponent + //destablizing force /obj/item/projectile/destabilizer name = "destabilizing force" diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 0549562f85..31ee37c3b0 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -153,7 +153,7 @@ w_class = WEIGHT_CLASS_NORMAL custom_materials = list(/datum/material/iron=350) attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked") - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/shovel/Initialize() . = ..() @@ -191,4 +191,4 @@ w_class = WEIGHT_CLASS_NORMAL toolspeed = 0.7 attack_verb = list("slashed", "impaled", "stabbed", "sliced") - sharpness = IS_SHARP + sharpness = SHARP_EDGED diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index a42fce3f7c..40c3a781fc 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -783,7 +783,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' hitsound_on = 'sound/weapons/bladeslice.ogg' w_class = WEIGHT_CLASS_BULKY - sharpness = IS_SHARP + sharpness = SHARP_EDGED faction_bonus_force = 30 nemesis_factions = list("mining", "boss") var/transform_cooldown @@ -890,7 +890,7 @@ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' flags_1 = CONDUCT_1 - sharpness = IS_SHARP + sharpness = SHARP_EDGED w_class = WEIGHT_CLASS_BULKY force = 1 throwforce = 1 @@ -1054,6 +1054,9 @@ /obj/item/lava_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() + INVOKE_ASYNC(src, .proc/attempt_lava, target, user, proximity_flag, click_parameters) + +/obj/item/lava_staff/proc/attempt_lava(atom/target, mob/user, proximity_flag, click_parameters) if(timer > world.time) return diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index b00e291685..564d554319 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -32,7 +32,7 @@ new /datum/data/mining_equipment("500 Point Transfer Card", /obj/item/card/mining_point_card/mp500, 500), new /datum/data/mining_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600), new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 750), - new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/kinetic_crusher, 750), + new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/kinetic_crusher, 750), new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750), new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 750), new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 800), @@ -68,6 +68,7 @@ new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150), new /datum/data/mining_equipment("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), new /datum/data/mining_equipment("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), + new /datum/data/mining_equipment("Kinetic Glaive", /obj/item/kinetic_crusher/glaive, 1500), new /datum/data/mining_equipment("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000), diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 49a3bffd42..768c4c943e 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -557,7 +557,6 @@ if(frn) client.prefs.random_character() client.prefs.real_name = client.prefs.pref_species.random_name(gender,1) - client.prefs.copy_to(H) var/cur_scar_index = client.prefs.scars_index if(client.prefs.persistent_scars && client.prefs.scars_list["[cur_scar_index]"]) var/scar_string = client.prefs.scars_list["[cur_scar_index]"] @@ -568,7 +567,6 @@ client.prefs.scars_list["[cur_scar_index]"] = valid_scars client.prefs.save_character() - client.prefs.copy_to(H) H.dna.update_dna_identity() if(mind) diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index d3dbfac8c8..24d456bf8f 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -73,7 +73,7 @@ if(victim.stat == CONSCIOUS) src.visible_message("[victim] kicks free of the blood pool just before entering it!", null, "You hear splashing and struggling.") - else if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/demonsblood)) + else if(victim.reagents?.has_reagent(/datum/reagent/consumable/ethanol/demonsblood)) visible_message("Something prevents [victim] from entering the pool!", "A strange force is blocking [victim] from entering!", "You hear a splash and a thud.") else victim.forceMove(src) @@ -104,7 +104,7 @@ if(!victim) return FALSE - if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/devilskiss)) + if(victim.reagents?.has_reagent(/datum/reagent/consumable/ethanol/devilskiss)) to_chat(src, "AAH! THEIR FLESH! IT BURNS!") adjustBruteLoss(25) //I can't use adjustHealth() here because bloodcrawl affects /mob/living and adjustHealth() only affects simple mobs var/found_bloodpool = FALSE diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 1e31655278..edb681e60f 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -92,17 +92,8 @@ if(!all_wounds || !(user.a_intent == INTENT_HELP || user == src)) return ..() - // The following priority/nonpriority searching is so that if we have two wounds on a limb that use the same item for treatment (gauze can bandage cuts AND splint broken bones), - // we prefer whichever wound is not already treated (ignore the splinted broken bone for the open cut). If there's no priority wounds that this can treat, go through the - // non-priority ones randomly. - var/list/nonpriority_wounds = list() - for(var/datum/wound/W in shuffle(all_wounds)) - if(!W.treat_priority) - nonpriority_wounds += W - else if(W.treat_priority && W.try_treating(I, user)) - return 1 - - for(var/datum/wound/W in shuffle(nonpriority_wounds)) + for(var/i in shuffle(all_wounds)) + var/datum/wound/W = i if(W.try_treating(I, user)) return 1 @@ -1209,16 +1200,16 @@ /** * generate_fake_scars()- for when you want to scar someone, but you don't want to hurt them first. These scars don't count for temporal scarring (hence, fake) * - * If you want a specific wound scar, pass that wound type as the second arg, otherwise you can pass a list like WOUND_LIST_CUT to generate a random cut scar. + * If you want a specific wound scar, pass that wound type as the second arg, otherwise you can pass a list like WOUND_LIST_SLASH to generate a random cut scar. * * Arguments: * * num_scars- A number for how many scars you want to add - * * forced_type- Which wound or category of wounds you want to choose from, WOUND_LIST_BONE, WOUND_LIST_CUT, or WOUND_LIST_BURN (or some combination). If passed a list, picks randomly from the listed wounds. Defaults to all 3 types + * * forced_type- Which wound or category of wounds you want to choose from, WOUND_LIST_BLUNT, WOUND_LIST_SLASH, or WOUND_LIST_BURN (or some combination). If passed a list, picks randomly from the listed wounds. Defaults to all 3 types */ /mob/living/carbon/proc/generate_fake_scars(num_scars, forced_type) for(var/i in 1 to num_scars) - var/datum/scar/S = new - var/obj/item/bodypart/BP = pick(bodyparts) + var/datum/scar/scaries = new + var/obj/item/bodypart/scar_part = pick(bodyparts) var/wound_type if(forced_type) @@ -1227,9 +1218,17 @@ else wound_type = forced_type else - wound_type = pick(WOUND_LIST_BONE + WOUND_LIST_CUT + WOUND_LIST_BURN) + wound_type = pick(GLOB.global_all_wound_types) - var/datum/wound/W = new wound_type - S.generate(BP, W) - S.fake = TRUE - QDEL_NULL(W) + var/datum/wound/phantom_wound = new wound_type + scaries.generate(scar_part, phantom_wound) + scaries.fake = TRUE + QDEL_NULL(phantom_wound) + +/** + * get_biological_state is a helper used to see what kind of wounds we roll for. By default we just assume carbons (read:monkeys) are flesh and bone, but humans rely on their species datums + * + * go look at the species def for more info [/datum/species/proc/get_biological_state] + */ +/mob/living/carbon/proc/get_biological_state() + return BIO_FLESH_BONE diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 9a2ed34f17..566c004142 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -76,7 +76,7 @@ if(!affecting) //missing limb? we select the first bodypart (you can never have zero, because of chest) affecting = bodyparts[1] SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting) - send_item_attack_message(I, user, affecting.name, totitemdamage) + send_item_attack_message(I, user, affecting.name, affecting, totitemdamage) I.do_stagger_action(src, user, totitemdamage) if(I.force) apply_damage(totitemdamage, I.damtype, affecting, wound_bonus = I.wound_bonus, bare_wound_bonus = I.bare_wound_bonus, sharpness = I.get_sharpness()) //CIT CHANGE - replaces I.force with totitemdamage @@ -100,12 +100,6 @@ head.add_mob_blood(src) update_inv_head() - //dismemberment - var/probability = I.get_dismemberment_chance(affecting) - if(prob(probability)) - if(affecting.dismember(I.damtype)) - I.add_mob_blood(src) - playsound(get_turf(src), I.get_dismember_sound(), 80, 1) return TRUE //successful attack /mob/living/carbon/attack_drone(mob/living/simple_animal/drone/user) @@ -131,9 +125,10 @@ if(S.next_step(user, act_intent)) return TRUE - for(var/datum/wound/W in all_wounds) + for(var/i in all_wounds) + var/datum/wound/W = i if(W.try_handling(user)) - return 1 + return TRUE /mob/living/carbon/attack_paw(mob/living/carbon/monkey/M) @@ -157,6 +152,7 @@ for(var/thing in M.diseases) var/datum/disease/D = thing ForceContractDisease(D) + return TRUE /mob/living/carbon/attack_slime(mob/living/simple_animal/slime/M) . = ..() @@ -397,7 +393,7 @@ to_chat(src, "Your eyes are really starting to hurt. This can't be good for you!") if(has_bane(BANE_LIGHT)) mind.disrupt_spells(-500) - return 1 + return TRUE else if(damage == 0) // just enough protection if(prob(20)) to_chat(src, "Something bright flashes in the corner of your vision!") @@ -472,3 +468,35 @@ var/obj/item/bodypart/limb = get_bodypart(zone) if(!limb) return + +/mob/living/carbon/send_item_attack_message(obj/item/I, mob/living/user, hit_area, obj/item/bodypart/hit_bodypart, totitemdamage) + var/message_verb = "attacked" + if(length(I.attack_verb)) + message_verb = "[pick(I.attack_verb)]" + else if(!I.force) + return + + var/extra_wound_details = "" + if(I.damtype == BRUTE && hit_bodypart.can_dismember()) + var/mangled_state = hit_bodypart.get_mangled_state() + var/bio_state = get_biological_state() + if(mangled_state == BODYPART_MANGLED_BOTH) + extra_wound_details = ", threatening to sever it entirely" + else if((mangled_state == BODYPART_MANGLED_FLESH && I.get_sharpness()) || (mangled_state & BODYPART_MANGLED_BONE && bio_state == BIO_JUST_BONE)) + extra_wound_details = ", [I.get_sharpness() == SHARP_EDGED ? "slicing" : "piercing"] through to the bone" + else if((mangled_state == BODYPART_MANGLED_BONE && I.get_sharpness()) || (mangled_state & BODYPART_MANGLED_FLESH && bio_state == BIO_JUST_FLESH)) + extra_wound_details = ", [I.get_sharpness() == SHARP_EDGED ? "slicing" : "piercing"] at the remaining tissue" + + var/message_hit_area = "" + if(hit_area) + message_hit_area = " in the [hit_area]" + var/attack_message = "[src] is [message_verb][message_hit_area] with [I][extra_wound_details]!" + var/attack_message_local = "You're [message_verb][message_hit_area] with [I][extra_wound_details]!" + if(user in viewers(src, null)) + attack_message = "[user] [message_verb] [src][message_hit_area] with [I][extra_wound_details]!" + attack_message_local = "[user] [message_verb] you[message_hit_area] with [I][extra_wound_details]!" + if(user == src) + attack_message_local = "You [message_verb] yourself[message_hit_area] with [I][extra_wound_details]" + visible_message("[attack_message]",\ + "[attack_message_local]", null, COMBAT_MESSAGE_RANGE) + return TRUE diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index ddf1019f2a..5c5a1d6d52 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -1,6 +1,6 @@ -/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE) +/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE) SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone) var/hit_percent = (100-blocked)/100 if(!forced && hit_percent <= 0) @@ -202,7 +202,7 @@ //Damages ONE bodypart randomly selected from damagable ones. //It automatically updates damage overlays if necessary //It automatically updates health status -/mob/living/carbon/take_bodypart_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, required_status, check_armor = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE) +/mob/living/carbon/take_bodypart_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, required_status, check_armor = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE) var/list/obj/item/bodypart/parts = get_damageable_bodyparts() if(!parts.len) return diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index be046a3713..5eabae16f7 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -44,7 +44,8 @@ msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] stuck to [t_his] [BP.name]!\n" else msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] embedded in [t_his] [BP.name]!\n" - for(var/datum/wound/W in BP.wounds) + for(var/i in BP.wounds) + var/datum/wound/W = i msg += "[W.get_examine_description(user)]\n" for(var/X in disabled) @@ -109,7 +110,7 @@ switch(scar_severity) if(1 to 2) - msg += "[t_He] [t_has] visible scarring, you can look again to take a closer look...\n" + msg += "[t_He] [t_has] visible scarring, you can look again to take a closer look...\n" if(3 to 4) msg += "[t_He] [t_has] several bad scars, you can look again to take a closer look...\n" if(5 to 6) diff --git a/code/modules/mob/living/carbon/human/damage_procs.dm b/code/modules/mob/living/carbon/human/damage_procs.dm index 5cd00b7e6a..04ec1196fd 100644 --- a/code/modules/mob/living/carbon/human/damage_procs.dm +++ b/code/modules/mob/living/carbon/human/damage_procs.dm @@ -1,5 +1,5 @@ // depending on the species, it will run the corresponding apply_damage code there -/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE) +/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE) return dna.species.apply_damage(damage, damagetype, def_zone, blocked, src, forced, spread_damage, wound_bonus, bare_wound_bonus, sharpness) diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 96517d5ea2..1e2a375b39 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -47,6 +47,5 @@ GLOBAL_LIST_EMPTY(dummy_mob_list) return var/mob/living/carbon/human/dummy/D = GLOB.human_dummy_list[slotnumber] if(istype(D)) - D.set_species(/datum/species/human,icon_update = TRUE, pref_load = TRUE) //for some fucking reason, if you don't change the species every time, some species will dafault certain things when it's their own species on the mannequin two times in a row, like lizards losing spines and tails setting to smooth. If you can find a fix for this that isn't this, good on you D.wipe_state() D.in_use = FALSE diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index cbea9293f5..65b2931e08 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -163,8 +163,9 @@ msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] stuck to [t_his] [BP.name]!\n" else msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] embedded in [t_his] [BP.name]!\n" - for(var/datum/wound/W in BP.wounds) - msg += "[W.get_examine_description(user)]\n" + for(var/i in BP.wounds) + var/datum/wound/iter_wound = i + msg += "[iter_wound.get_examine_description(user)]\n" for(var/X in disabled) var/obj/item/bodypart/BP = X @@ -270,7 +271,12 @@ bleeding_limbs += BP var/num_bleeds = LAZYLEN(bleeding_limbs) - var/bleed_text = "[t_He] [t_is] bleeding from [t_his]" + var/list/bleed_text + if(appears_dead) + bleed_text = list("Blood is visible in [t_his] open") + else + bleed_text = list("[t_He] [t_is] bleeding from [t_his]") + switch(num_bleeds) if(1 to 2) bleed_text += " [bleeding_limbs[1].name][num_bleeds == 2 ? " and [bleeding_limbs[2].name]" : ""]" @@ -280,8 +286,15 @@ bleed_text += " [BP.name]," bleed_text += " and [bleeding_limbs[num_bleeds].name]" - bleed_text += "!\n" - msg += bleed_text + + if(appears_dead) + bleed_text += ", but it has pooled and is not flowing.\n" + else + if(reagents.has_reagent(/datum/reagent/toxin/heparin)) + bleed_text += " incredibly quickly" + + bleed_text += "!\n" + msg += bleed_text.Join() if(reagents.has_reagent(/datum/reagent/teslium)) msg += "[t_He] [t_is] emitting a gentle blue glow!\n" @@ -365,7 +378,7 @@ switch(scar_severity) if(1 to 2) - msg += "[t_He] [t_has] visible scarring, you can look again to take a closer look...\n" + msg += "[t_He] [t_has] visible scarring, you can look again to take a closer look...\n" if(3 to 4) msg += "[t_He] [t_has] several bad scars, you can look again to take a closer look...\n" if(5 to 6) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 8672c0e83d..af95b9e1b7 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -154,19 +154,29 @@ /// For use formatting all of the scars this human has for saving for persistent scarring /mob/living/carbon/human/proc/format_scars() - if(!all_scars) + var/list/missing_bodyparts = get_missing_limbs() + if(!all_scars && !length(missing_bodyparts)) return var/scars = "" + for(var/i in missing_bodyparts) + var/datum/scar/scaries = new + scars += "[scaries.format_amputated(i)]" for(var/i in all_scars) - var/datum/scar/S = i - scars += "[S.format()];" + var/datum/scar/scaries = i + scars += "[scaries.format()];" return scars /// Takes a single scar from the persistent scar loader and recreates it from the saved data /mob/living/carbon/human/proc/load_scar(scar_line) var/list/scar_data = splittext(scar_line, "|") - if(LAZYLEN(scar_data) != 4) + if(LAZYLEN(scar_data) != SCAR_SAVE_LENGTH) return // invalid, should delete - var/obj/item/bodypart/BP = get_bodypart("[scar_data[SCAR_SAVE_ZONE]]") - var/datum/scar/S = new - return S.load(BP, scar_data[SCAR_SAVE_DESC], scar_data[SCAR_SAVE_PRECISE_LOCATION], text2num(scar_data[SCAR_SAVE_SEVERITY])) + var/version = text2num(scar_data[SCAR_SAVE_VERS]) + if(!version || version < SCAR_CURRENT_VERSION) // get rid of old scars + return + var/obj/item/bodypart/the_part = get_bodypart("[scar_data[SCAR_SAVE_ZONE]]") + var/datum/scar/scaries = new + return scaries.load(the_part, scar_data[SCAR_SAVE_VERS], scar_data[SCAR_SAVE_DESC], scar_data[SCAR_SAVE_PRECISE_LOCATION], text2num(scar_data[SCAR_SAVE_SEVERITY])) + +/mob/living/carbon/human/get_biological_state() + return dna.species.get_biological_state() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 59c7c39e35..dc7fe86aca 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -73,7 +73,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/datum/outfit/outfit_important_for_life // A path to an outfit that is important for species life e.g. plasmaman outfit // species-only traits. Can be found in DNA.dm - var/list/species_traits = list(CAN_SCAR) //by default they can scar unless set to something else + var/list/species_traits = list(HAS_FLESH,HAS_BONE) //by default they can scar and have bones/flesh unless set to something else // generic traits tied to having the species var/list/inherent_traits = list() var/inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID @@ -1746,20 +1746,13 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) apply_damage(totitemdamage * weakness, I.damtype, def_zone, armor_block, H, wound_bonus = Iwound_bonus, bare_wound_bonus = I.bare_wound_bonus, sharpness = I.get_sharpness()) - H.send_item_attack_message(I, user, hit_area, totitemdamage) + H.send_item_attack_message(I, user, hit_area, affecting, totitemdamage) I.do_stagger_action(H, user, totitemdamage) if(!totitemdamage) return 0 //item force is zero - //dismemberment - var/probability = I.get_dismemberment_chance(affecting) - if(prob(probability) || (HAS_TRAIT(H, TRAIT_EASYDISMEMBER) && prob(probability))) //try twice - if(affecting.dismember(I.damtype)) - I.add_mob_blood(H) - playsound(get_turf(H), I.get_dismember_sound(), 80, 1) - var/bloody = 0 if(((I.damtype == BRUTE) && I.force && prob(25 + (I.force * 2)))) if(affecting.status == BODYPART_ORGANIC) @@ -1962,7 +1955,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) target.ShoveOffBalance(SHOVE_OFFBALANCE_DURATION) log_combat(user, target, "shoved", append_message) -/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE) +/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE) SEND_SIGNAL(H, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone, wound_bonus, bare_wound_bonus, sharpness) // make sure putting wound_bonus here doesn't screw up other signals or uses for this signal var/hit_percent = (100-(blocked+armor))/100 hit_percent = (hit_percent * (100-H.physiology.damage_resistance))/100 @@ -2038,6 +2031,25 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) // called before a projectile hit return +/** + + + + * The human species version of [/mob/living/carbon/proc/get_biological_state]. Depends on the HAS_FLESH and HAS_BONE species traits, having bones lets you have bone wounds, having flesh lets you have burn, slash, and piercing wounds + + + + */ + + + +/datum/species/proc/get_biological_state(mob/living/carbon/human/H) + . = BIO_INORGANIC + if(HAS_FLESH in species_traits) + . |= BIO_JUST_FLESH + if(HAS_BONE in species_traits) + . |= BIO_JUST_BONE + ///////////// //BREATHING// ///////////// diff --git a/code/modules/mob/living/carbon/human/species_types/abductors.dm b/code/modules/mob/living/carbon/human/species_types/abductors.dm index 1e77775efa..38e10e8662 100644 --- a/code/modules/mob/living/carbon/human/species_types/abductors.dm +++ b/code/modules/mob/living/carbon/human/species_types/abductors.dm @@ -3,7 +3,7 @@ id = "abductor" say_mod = "gibbers" sexes = FALSE - species_traits = list(NOBLOOD,NOEYES,NOGENITALS,NOAROUSAL,CAN_SCAR) + species_traits = list(NOBLOOD,NOEYES,NOGENITALS,NOAROUSAL,HAS_FLESH,HAS_BONE) inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_CHUNKYFINGERS,TRAIT_NOHUNGER,TRAIT_NOBREATH) mutanttongue = /obj/item/organ/tongue/abductor species_type = "alien" diff --git a/code/modules/mob/living/carbon/human/species_types/angel.dm b/code/modules/mob/living/carbon/human/species_types/angel.dm index d6860e1249..2cf054c7b9 100644 --- a/code/modules/mob/living/carbon/human/species_types/angel.dm +++ b/code/modules/mob/living/carbon/human/species_types/angel.dm @@ -2,7 +2,7 @@ name = "Angel" id = "angel" default_color = "FFFFFF" - species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,CAN_SCAR) + species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE) mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "wings" = "Angel") use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM no_equip = list(SLOT_BACK) diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm index 25fb51aa87..2a955e28a4 100644 --- a/code/modules/mob/living/carbon/human/species_types/bugmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm @@ -3,7 +3,7 @@ id = "insect" say_mod = "chitters" default_color = "00FF00" - species_traits = list(LIPS,EYECOLOR,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR,WINGCOLOR,CAN_SCAR) + species_traits = list(LIPS,EYECOLOR,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "insect_wings" = "None", "insect_fluff" = "None", "mam_snouts" = "None", "taur" = "None", "insect_markings" = "None") diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index dcd81c90b9..d8dfe63b35 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -2,8 +2,8 @@ name = "Dullahan" id = "dullahan" default_color = "FFFFFF" - species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS) - inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH,CAN_SCAR) + species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE) + inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH) mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "deco_wings" = "None") use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM mutant_brain = /obj/item/organ/brain/dullahan diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm index 8eb0e0181c..a465e7c3a9 100644 --- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm +++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm @@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) // name = "Dwarf" id = "dwarf" //Also called Homo sapiens pumilionis default_color = "FFFFFF" - species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,CAN_SCAR) + species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE) inherent_traits = list(TRAIT_DWARF,TRAIT_SNOB) limbs_id = "human" use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index b99c3e2bc2..c56adaf1b0 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -2,7 +2,7 @@ name = "Anthromorphic Fly" id = "fly" say_mod = "buzzes" - species_traits = list(NOEYES,CAN_SCAR) + species_traits = list(NOEYES,HAS_FLESH,HAS_BONE) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG mutanttongue = /obj/item/organ/tongue/fly mutantliver = /obj/item/organ/liver/fly diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index 18359f415f..7706d4a9d5 100644 --- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -3,7 +3,7 @@ id = "mammal" default_color = "4B4B4B" icon_limbs = DEFAULT_BODYPART_ICON_CITADEL - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,CAN_SCAR) + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BEAST mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None", "mam_body_markings" = "Husky", "taur" = "None", "horns" = "None", "legs" = "Plantigrade", "meat_type" = "Mammalian") diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index e93a5106c9..f175ddb921 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -3,7 +3,7 @@ id = "human" default_color = "FFFFFF" - species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR,CAN_SCAR) + species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR,HAS_FLESH,HAS_BONE) mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF","tail_human" = "None", "ears" = "None", "taur" = "None", "deco_wings" = "None") use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM skinned_type = /obj/item/stack/sheet/animalhide/human diff --git a/code/modules/mob/living/carbon/human/species_types/ipc.dm b/code/modules/mob/living/carbon/human/species_types/ipc.dm index b5862b2bd2..3aef14c256 100644 --- a/code/modules/mob/living/carbon/human/species_types/ipc.dm +++ b/code/modules/mob/living/carbon/human/species_types/ipc.dm @@ -6,7 +6,7 @@ icon_limbs = DEFAULT_BODYPART_ICON_CITADEL blacklisted = 0 sexes = 0 - species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING) + species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING,HAS_FLESH,HAS_BONE) inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID mutant_bodyparts = list("ipc_screen" = "Blank", "ipc_antenna" = "None") meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index dc821c11ef..4498306b89 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -4,7 +4,7 @@ id = "jelly" default_color = "00FF90" say_mod = "chirps" - species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR) + species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR,HAS_FLESH,HAS_BONE) mutantlungs = /obj/item/organ/lungs/slime mutant_heart = /obj/item/organ/heart/slime mutant_bodyparts = list("mcolor" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None") diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 7bcf6c89f4..d768788e87 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -4,7 +4,7 @@ id = "lizard" say_mod = "hisses" default_color = "00FF00" - species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS,HORNCOLOR,WINGCOLOR,CAN_SCAR) + species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE) mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur", "deco_wings") inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE mutanttongue = /obj/item/organ/tongue/lizard diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 4cb5442bf8..f91c3518a3 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -8,7 +8,7 @@ nojumpsuit = TRUE say_mod = "poofs" //what does a mushroom sound like - species_traits = list(MUTCOLORS, NOEYES, NO_UNDERWEAR,NOGENITALS,NOAROUSAL,CAN_SCAR) + species_traits = list(MUTCOLORS, NOEYES, NO_UNDERWEAR,NOGENITALS,NOAROUSAL,HAS_FLESH,HAS_BONE) inherent_traits = list(TRAIT_NOBREATH) speedmod = 1.5 //faster than golems but not by much diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 5008fb13cd..b61e29b685 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -4,7 +4,7 @@ say_mod = "rattles" sexes = 0 meat = /obj/item/stack/sheet/mineral/plasma - species_traits = list(NOBLOOD,NOTRANSSTING,NOGENITALS) + species_traits = list(NOBLOOD,NOTRANSSTING,NOGENITALS,HAS_BONE) inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_NOHUNGER,TRAIT_CALCIUM_HEALER) inherent_biotypes = MOB_HUMANOID|MOB_MINERAL mutantlungs = /obj/item/organ/lungs/plasmaman diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 706995d611..f5a2f807e4 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -3,7 +3,7 @@ name = "Anthromorphic Plant" id = "pod" default_color = "59CE00" - species_traits = list(MUTCOLORS,EYECOLOR,CAN_SCAR) + species_traits = list(MUTCOLORS,EYECOLOR,CAN_SCAR,HAS_FLESH,HAS_BONE) attack_verb = "slash" attack_sound = 'sound/weapons/slice.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index 9f7d165edf..b9864bce16 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -9,8 +9,8 @@ blacklisted = 1 ignored_by = list(/mob/living/simple_animal/hostile/faithless) meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow - species_traits = list(NOBLOOD,NOEYES,CAN_SCAR) - inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH,CAN_SCAR) + species_traits = list(NOBLOOD,NOEYES,HAS_FLESH,HAS_BONE) + inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH) dangerous_existence = 1 mutanteyes = /obj/item/organ/eyes/night_vision @@ -166,7 +166,7 @@ righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi' item_flags = ABSTRACT | DROPDEL w_class = WEIGHT_CLASS_HUGE - sharpness = IS_SHARP + sharpness = SHARP_EDGED total_mass = TOTAL_MASS_HAND_REPLACEMENT /obj/item/light_eater/Initialize() diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 54d56fea06..51d81bd4d3 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -5,7 +5,7 @@ blacklisted = 0 sexes = 0 meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton - species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL) + species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL,HAS_BONE) inherent_traits = list(TRAIT_NOBREATH,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH, TRAIT_CALCIUM_HEALER) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutanttongue = /obj/item/organ/tongue/bone diff --git a/code/modules/mob/living/carbon/human/species_types/synthliz.dm b/code/modules/mob/living/carbon/human/species_types/synthliz.dm index 41b3d3a96a..5ed806b302 100644 --- a/code/modules/mob/living/carbon/human/species_types/synthliz.dm +++ b/code/modules/mob/living/carbon/human/species_types/synthliz.dm @@ -4,7 +4,7 @@ icon_limbs = DEFAULT_BODYPART_ICON_CITADEL say_mod = "beeps" default_color = "00FF00" - species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR) + species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR,HAS_FLESH,HAS_BONE) inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID mutant_bodyparts = list("ipc_antenna" = "Synthetic Lizard - Antennae","mam_tail" = "Synthetic Lizard", "mam_snouts" = "Synthetic Lizard - Snout", "legs" = "Digitigrade", "mam_body_markings" = "Synthetic Lizard - Plates", "taur" = "None") meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index d8fc06b716..723c4848fe 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -2,7 +2,7 @@ name = "Vampire" id = "vampire" default_color = "FFFFFF" - species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,DRINKSBLOOD) + species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,DRINKSBLOOD,HAS_FLESH,HAS_BONE) inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutant_bodyparts = list("mcolor" = "FFFFFF", "tail_human" = "None", "ears" = "None", "deco_wings" = "None") diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 990e2c9db3..81a7f6e2e7 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -8,7 +8,7 @@ sexes = 0 blacklisted = 1 meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie - species_traits = list(NOBLOOD,NOZOMBIE,NOTRANSSTING,CAN_SCAR) + species_traits = list(NOBLOOD,NOZOMBIE,NOTRANSSTING,HAS_FLESH,HAS_BONE) inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_NOBREATH,TRAIT_NODEATH,TRAIT_FAKEDEATH) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutanttongue = /obj/item/organ/tongue/zombie @@ -45,7 +45,7 @@ /datum/species/zombie/infectious/spec_stun(mob/living/carbon/human/H,amount) . = min(20, amount) -/datum/species/zombie/infectious/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE) +/datum/species/zombie/infectious/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE) . = ..() if(.) regen_cooldown = world.time + REGENERATION_DELAY @@ -63,9 +63,9 @@ C.heal_overall_damage(heal_amt,heal_amt) C.adjustToxLoss(-heal_amt) for(var/i in C.all_wounds) - var/datum/wound/W = i - if(prob(4-W.severity)) - W.remove_wound() + var/datum/wound/iter_wound = i + if(prob(4-iter_wound.severity)) + iter_wound.remove_wound() if(!C.InCritical() && prob(4)) playsound(C, pick(spooks), 50, TRUE, 10) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 012808647e..47c9062148 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -14,7 +14,7 @@ * * Returns TRUE if damage applied */ -/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE) +/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE) var/hit_percent = (100-blocked)/100 if(!damage || (hit_percent <= 0)) return 0 @@ -245,7 +245,7 @@ update_stamina() // damage ONE external organ, organ gets randomly selected from damaged ones. -/mob/living/proc/take_bodypart_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, required_status, check_armor = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE) +/mob/living/proc/take_bodypart_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, required_status, check_armor = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE) adjustBruteLoss(brute, FALSE) //zero as argument for no instant health update adjustFireLoss(burn, FALSE) adjustStaminaLoss(stamina, FALSE) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index b04f78f3ec..0f55d5c408 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -605,41 +605,55 @@ SEND_SIGNAL(item, COMSIG_ITEM_WEARERCROSSED, AM) /mob/living/proc/makeTrail(turf/target_turf, turf/start, direction) - if(!has_gravity()) + if(!has_gravity() || !isturf(start) || !blood_volume) return - var/blood_exists = FALSE + var/blood_exists = locate(/obj/effect/decal/cleanable/trail_holder) in start - for(var/obj/effect/decal/cleanable/trail_holder/C in start) //checks for blood splatter already on the floor - blood_exists = TRUE - if(isturf(start)) - var/trail_type = getTrail() - if(trail_type) - var/brute_ratio = round(getBruteLoss() / maxHealth, 0.1) - if(blood_volume && blood_volume > max((BLOOD_VOLUME_NORMAL*blood_ratio)*(1 - brute_ratio * 0.25), 0))//don't leave trail if blood volume below a threshold - blood_volume = max(blood_volume - max(1, brute_ratio * 2), 0) //that depends on our brute damage. - var/newdir = get_dir(target_turf, start) - if(newdir != direction) - newdir = newdir | direction - if(newdir == 3) //N + S - newdir = NORTH - else if(newdir == 12) //E + W - newdir = EAST - if((newdir in GLOB.cardinals) && (prob(50))) - newdir = turn(get_dir(target_turf, start), 180) - if(!blood_exists) - new /obj/effect/decal/cleanable/trail_holder(start, get_static_viruses()) + var/trail_type = getTrail() + if(!trail_type) + return - for(var/obj/effect/decal/cleanable/trail_holder/TH in start) - if((!(newdir in TH.existing_dirs) || trail_type == "trails_1" || trail_type == "trails_2") && TH.existing_dirs.len <= 16) //maximum amount of overlays is 16 (all light & heavy directions filled) - TH.existing_dirs += newdir - TH.add_overlay(image('icons/effects/blood.dmi', trail_type, dir = newdir)) - TH.transfer_mob_blood_dna(src) + var/brute_ratio = round(getBruteLoss() / maxHealth, 0.1) + if(blood_volume < max(BLOOD_VOLUME_NORMAL*(1 - brute_ratio * 0.25), 0))//don't leave trail if blood volume below a threshold + return + + var/bleed_amount = bleedDragAmount() + blood_volume = max(blood_volume - bleed_amount, 0) //that depends on our brute damage. + var/newdir = get_dir(target_turf, start) + if(newdir != direction) + newdir = newdir | direction + if(newdir == (NORTH|SOUTH)) + newdir = NORTH + else if(newdir == (EAST|WEST)) + newdir = EAST + if((newdir in GLOB.cardinals) && (prob(50))) + newdir = turn(get_dir(target_turf, start), 180) + if(!blood_exists) + new /obj/effect/decal/cleanable/trail_holder(start, get_static_viruses()) + + for(var/obj/effect/decal/cleanable/trail_holder/TH in start) + if((!(newdir in TH.existing_dirs) || trail_type == "trails_1" || trail_type == "trails_2") && TH.existing_dirs.len <= 16) //maximum amount of overlays is 16 (all light & heavy directions filled) + TH.existing_dirs += newdir + TH.add_overlay(image('icons/effects/blood.dmi', trail_type, dir = newdir)) + TH.transfer_mob_blood_dna(src) /mob/living/carbon/human/makeTrail(turf/T) if((NOBLOOD in dna.species.species_traits) || !is_bleeding() || bleedsuppress) return ..() +///Returns how much blood we're losing from being dragged a tile, from [mob/living/proc/makeTrail] +/mob/living/proc/bleedDragAmount() + var/brute_ratio = round(getBruteLoss() / maxHealth, 0.1) + return max(1, brute_ratio * 2) + +/mob/living/carbon/bleedDragAmount() + var/bleed_amount = 0 + for(var/i in all_wounds) + var/datum/wound/iter_wound = i + bleed_amount += iter_wound.drag_bleed_amount() + return bleed_amount + /mob/living/proc/getTrail() if(getBruteLoss() < 300) return pick("ltrails_1", "ltrails_2") diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 5be9dbf195..19adb7b787 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -86,7 +86,7 @@ totaldamage = block_calculate_resultant_damage(totaldamage, returnlist) var/armor = run_armor_check(def_zone, P.flag, null, null, P.armour_penetration, null) if(!P.nodamage) - apply_damage(totaldamage, P.damage_type, def_zone, armor, wound_bonus=P.wound_bonus, bare_wound_bonus=P.bare_wound_bonus, sharpness=P.sharpness) + apply_damage(totaldamage, P.damage_type, def_zone, armor, wound_bonus = P.wound_bonus, bare_wound_bonus = P.bare_wound_bonus, sharpness = P.sharpness) if(P.dismemberment) check_projectile_dismemberment(P, def_zone) var/missing = 100 - final_percent @@ -136,12 +136,13 @@ dtype = I.damtype if(!blocked) - visible_message("[src] has been hit by [I].", \ - "You have been hit by [I].") - var/armor = run_armor_check(impacting_zone, "melee", "Your armor has protected your [parse_zone(impacting_zone)].", "Your armor has softened hit to your [parse_zone(impacting_zone)].",I.armour_penetration) - apply_damage(total_damage, dtype, impacting_zone, armor, sharpness=I.sharpness) - if(I.thrownby) - log_combat(I.thrownby, src, "threw and hit", I) + if(!nosell_hit) + visible_message("[src] is hit by [I]!", \ + "You're hit by [I]!") + if(!I.throwforce) + return + var/armor = run_armor_check(impacting_zone, "melee", "Your armor has protected your [parse_zone(impacting_zone)].", "Your armor has softened hit to your [parse_zone(impacting_zone)].",I.armour_penetration) + apply_damage(I.throwforce, dtype, impacting_zone, armor, sharpness=I.get_sharpness(), wound_bonus=(nosell_hit * CANT_WOUND)) else return 1 else diff --git a/code/modules/mob/living/silicon/damage_procs.dm b/code/modules/mob/living/silicon/damage_procs.dm index b89f249c80..7530630d74 100644 --- a/code/modules/mob/living/silicon/damage_procs.dm +++ b/code/modules/mob/living/silicon/damage_procs.dm @@ -1,5 +1,5 @@ -/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE) +/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE) var/hit_percent = (100-blocked)/100 if(!damage || (!forced && hit_percent <= 0)) return 0 diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 65e1047cdc..c0fca997f5 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -3,8 +3,14 @@ emote_type = EMOTE_AUDIBLE /datum/emote/sound/silicon - mob_type_allowed_typecache = list(/mob/living/silicon) + mob_type_allowed_typecache = list(/mob/living/silicon, /mob/living/carbon/human) emote_type = EMOTE_AUDIBLE + var/unrestricted = FALSE + +/datum/emote/sound/silicon/run_emote(mob/user, params) + if(!unrestricted && !(issilicon(user) || isipcperson(user))) + return + return ..() /datum/emote/silicon/boop key = "boop" diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 73ebfa7c77..fb24b0fc09 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -60,11 +60,13 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/magic_fluff_string = "You draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!" var/tech_fluff_string = "BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!" var/carp_fluff_string = "CARP CARP CARP SOME SORT OF HORRIFIC BUG BLAME THE CODERS CARP CARP CARP" + /// sigh, fine. + var/datum/song/holoparasite/music_datum /mob/living/simple_animal/hostile/guardian/Initialize(mapload, theme) GLOB.parasites += src updatetheme(theme) - + music_datum = new(src, get_allowed_instrument_ids()) . = ..() /mob/living/simple_animal/hostile/guardian/med_hud_set_health() @@ -84,8 +86,16 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians /mob/living/simple_animal/hostile/guardian/Destroy() GLOB.parasites -= src + QDEL_NULL(music_datum) return ..() +/mob/living/simple_animal/hostile/guardian/verb/music_interact() + set name = "Access Internal Synthesizer" + set desc = "Access your internal musical synthesizer" + set category = "IC" + + music_datum.ui_interact(src) + /mob/living/simple_animal/hostile/guardian/proc/updatetheme(theme) //update the guardian's theme if(!theme) theme = pick("magic", "tech", "carp") @@ -638,6 +648,12 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians /obj/item/guardiancreator/tech/choose/dextrous possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support") +/obj/item/guardiancreator/tech/choose/nukie // lacks support and protector as encouraging nukies to play turtle isnt fun and dextrous is epic + possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Ranged", "Standard") + +/obj/item/guardiancreator/tech/choose/nukie/check_uplink_validity() + return !used + /obj/item/paper/guides/antag/guardian name = "Holoparasite Guide" icon_state = "paper_words" @@ -677,7 +693,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
Charger: Moves extremely fast, does medium damage on attack, and can charge at targets, damaging the first target hit and forcing them to drop any items they are holding.

- Dexterous: Does low damage on attack, but is capable of holding items and storing a single item within it. It will drop items held in its hands when it recalls, but it will retain the stored item.
+ Dextrous: Does low damage on attack, but is capable of holding items and storing a single item within it. It will drop items held in its hands when it recalls, but it will retain the stored item.

Explosive: High damage resist and medium power attack that may explosively teleport targets. Can turn any object, including objects too large to pick up, into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered or after a delay.

@@ -691,6 +707,29 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
"} +/obj/item/paper/guides/antag/guardian/nukie + name = "Guardian Guide" + info = {"A list of Guardian Types
+ +
+ Assassin: Does medium damage and takes full damage, but can enter stealth, causing its next attack to do massive damage and ignore armor. However, it becomes briefly unable to recall after attacking from stealth.
+
+ Chaos: Ignites enemies on touch and causes them to hallucinate all nearby people as the guardian. Automatically extinguishes the user if they catch on fire.
+
+ Charger: Moves extremely fast, does medium damage on attack, and can charge at targets, damaging the first target hit and forcing them to drop any items they are holding.
+
+ Dextrous: Does low damage on attack, but is capable of holding items and storing a single item within it. It will drop items held in its hands when it recalls, but it will retain the stored item.
+
+ Explosive: High damage resist and medium power attack that may explosively teleport targets. Can turn any object, including objects too large to pick up, into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered or after a delay.
+
+ Lightning: Attacks apply lightning chains to targets. Has a lightning chain to the user. Lightning chains shock everything near them, doing constant damage.
+
+ Ranged: Has two modes. Ranged; which fires a constant stream of weak, armor-ignoring projectiles. Scout; Cannot attack, but can move through walls and is quite hard to see. Can lay surveillance snares, which alert it when crossed, in either mode.
+
+ Standard: Devastating close combat attacks and high damage resist. Can smash through weak walls.
+
+"} + /obj/item/storage/box/syndie_kit/guardian name = "holoparasite injector kit" @@ -699,6 +738,13 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians new /obj/item/guardiancreator/tech/choose/traitor(src) new /obj/item/paper/guides/antag/guardian(src) +/obj/item/storage/box/syndie_kit/nukieguardian + name = "holoparasite injector kit" + +/obj/item/storage/box/syndie_kit/nukieguardian/PopulateContents() + new /obj/item/guardiancreator/tech/choose/nukie(src) + new /obj/item/paper/guides/antag/guardian/nukie(src) + /obj/item/guardiancreator/carp name = "holocarp fishsticks" desc = "Using the power of Carp'sie, you can catch a carp from byond the veil of Carpthulu, and bind it to your fleshy flesh form." diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 057d4bdb45..da16ec581b 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -33,7 +33,7 @@ melee_damage_upper = 15 wound_bonus = -5 bare_wound_bonus = 10 // BEAR wound bonus am i right - sharpness = TRUE + sharpness = SHARP_EDGED attack_verb_continuous = "claws" attack_verb_simple = "claw" attack_sound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 4ea8a3c5dc..fd37bb26aa 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -79,7 +79,7 @@ melee_damage_upper = 15 wound_bonus = -10 bare_wound_bonus = 20 - sharpness = TRUE + sharpness = SHARP_EDGED icon_state = "syndicate_knife" icon_living = "syndicate_knife" loot = list(/obj/effect/gibspawner/human) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 1102559aca..706bcc46f5 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -145,7 +145,7 @@ //How much bare wounding power it has var/bare_wound_bonus = 0 //If the attacks from this are sharp - var/sharpness = FALSE + var/sharpness = SHARP_NONE /mob/living/simple_animal/Initialize() . = ..() diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 195c50e958..03a3ab1001 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -161,4 +161,4 @@ /// The timer that will remove our indicator for early aborts (like when an user finishes their message) var/typing_indicator_timerid /// Current state of our typing indicator. Used for cut overlay, DO NOT RUNTIME ASSIGN OTHER THAN FROM SHOW/CLEAR. Used to absolutely ensure we do not get stuck overlays. - var/typing_indicator_current + var/mutable_appearance/typing_indicator_current diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm index f28cbe4385..6154828f4d 100644 --- a/code/modules/mob/typing_indicator.dm +++ b/code/modules/mob/typing_indicator.dm @@ -15,13 +15,23 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays) /mob/proc/get_typing_indicator_icon_state() return typing_indicator_state +/// Generates the mutable appearance for typing indicator. Should prevent stuck overlays. +/mob/proc/generate_typing_indicator() + var/state = get_typing_indicator_icon_state() + if(ispath(state)) + var/atom/thing = new state(null) + var/mutable_appearance/generated = new(thing) + return generated + else + CRASH("Unsupported typing indicator state: [state]") + /** * Displays typing indicator. * @param timeout_override - Sets how long until this will disappear on its own without the user finishing their message or logging out. Defaults to src.typing_indicator_timeout * @param state_override - Sets the state that we will fetch. Defaults to src.get_typing_indicator_icon_state() * @param force - shows even if src.typing_indcator_enabled is FALSE. */ -/mob/proc/display_typing_indicator(timeout_override = TYPING_INDICATOR_TIMEOUT, state_override = get_typing_indicator_icon_state(), force = FALSE) +/mob/proc/display_typing_indicator(timeout_override = TYPING_INDICATOR_TIMEOUT, state_override = generate_typing_indicator(), force = FALSE) if((!typing_indicator_enabled && !force) || typing_indicator_current) return typing_indicator_current = state_override diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index e6d53d914f..00cfa94893 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -14,7 +14,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 50 slot_flags = ITEM_SLOT_BELT - sharpness = IS_SHARP + sharpness = SHARP_EDGED max_integrity = 200 resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/datum/effect_system/spark_spread/spark_system diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm index 508722ecf2..57faad9493 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm @@ -14,5 +14,5 @@ /obj/item/throwing_star/ninja name = "ninja throwing star" - throwforce = 30 + throwforce = 20 embedding = list("pain_mult" = 6, "embed_chance" = 100, "fall_chance" = 0, "embed_chance_turf_mod" = 15) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 08252d4e05..997ada6b21 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -28,6 +28,7 @@ var/degrees = 0 var/font = PEN_FONT embedding = list() + sharpness = SHARP_POINTY /obj/item/pen/suicide_act(mob/user) user.visible_message("[user] is scribbling numbers all over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku...") @@ -84,7 +85,7 @@ throw_speed = 4 colour = "crimson" custom_materials = list(/datum/material/gold = 750) - sharpness = IS_SHARP + sharpness = SHARP_EDGED resistance_flags = FIRE_PROOF unique_reskin = list("Oak" = "pen-fountain-o", "Gold" = "pen-fountain-g", @@ -180,7 +181,7 @@ */ /obj/item/pen/edagger attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off - sharpness = IS_SHARP + sharpness = SHARP_EDGED var/on = FALSE embedding = list(embed_chance = EMBED_CHANCE) diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index e4674f4f4c..987efc0404 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -47,7 +47,7 @@ /obj/item/ammo_box/c38/dumdum name = "speed loader (.38 DumDum)" - desc = "Designed to quickly reload revolvers. DumDum bullets shatter on impact and shred the target's innards, likely getting caught inside." + desc = "Designed to quickly reload revolvers. These rounds expand on impact, allowing them to shred the target and cause massive bleeding. Very weak against armor and distant targets." ammo_type = /obj/item/ammo_casing/c38/dumdum /obj/item/ammo_box/c38/match diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 4126c81367..c3248bab2f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -193,7 +193,8 @@ return if(iscarbon(target)) var/mob/living/carbon/C = target - for(var/datum/wound/W in C.all_wounds) + for(var/i in C.all_wounds) + var/datum/wound/W = i if(W.try_treating(src, user)) return // another coward cured! diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 6489920b98..20e847326e 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -125,7 +125,7 @@ flags_1 = CONDUCT_1 attack_verb = list("attacked", "slashed", "cut", "sliced") force = 12 - sharpness = IS_SHARP + sharpness = SHARP_EDGED inaccuracy_modifier = 0.25 can_charge = 0 diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index b23b059d89..6ebdc5e7b8 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -83,7 +83,7 @@ force = 20 armour_penetration = 75 block_chance = 50 - sharpness = IS_SHARP + sharpness = SHARP_EDGED max_charges = 4 /obj/item/gun/magic/staff/spellblade/Initialize() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index f3d78af59b..43384280d4 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -149,19 +149,25 @@ var/temporary_unstoppable_movement = FALSE - ///If defined, on hit we create an item of this type then call hitby() on the hit target with this + ///If defined, on hit we create an item of this type then call hitby() on the hit target with this, mainly used for embedding items (bullets) in targets var/shrapnel_type ///If TRUE, hit mobs even if they're on the floor and not our target var/hit_stunned_targets = FALSE wound_bonus = CANT_WOUND + ///How much we want to drop both wound_bonus and bare_wound_bonus (to a minimum of 0 for the latter) per tile, for falloff purposes + var/wound_falloff_tile + ///How much we want to drop the embed_chance value, if we can embed, per tile, for falloff purposes + var/embed_falloff_tile /// For telling whether we want to roll for bone breaking or lacerations if we're bothering with wounds - sharpness = FALSE + sharpness = SHARP_NONE /obj/item/projectile/Initialize() . = ..() permutated = list() decayedRange = range + if(embedding) + updateEmbedding() /** * Artificially modified to be called at around every world.icon_size pixels of movement. @@ -169,6 +175,11 @@ */ /obj/item/projectile/proc/Range() range-- + if(wound_bonus != CANT_WOUND) + wound_bonus += wound_falloff_tile + bare_wound_bonus = max(0, bare_wound_bonus + wound_falloff_tile) + if(embedding) + embedding["embed_chance"] += embed_falloff_tile if(range <= 0 && loc) on_range() diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 6a081f9b03..b408957aa7 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -8,4 +8,12 @@ flag = "bullet" hitsound_wall = "ricochet" impact_effect_type = /obj/effect/temp_visual/impact_effect - sharpness = TRUE \ No newline at end of file + sharpness = SHARP_POINTY + shrapnel_type = /obj/item/shrapnel/bullet + embedding = list(embed_chance=15, fall_chance=2, jostle_chance=0, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.5, pain_mult=3, rip_time=10) + wound_falloff_tile = -5 + embed_falloff_tile = -5 + +/obj/item/projectile/bullet/smite + name = "divine retribution" + damage = 10 diff --git a/code/modules/projectiles/projectile/bullets/lmg.dm b/code/modules/projectiles/projectile/bullets/lmg.dm index 2ea1fe7c9a..e3eff6dcb0 100644 --- a/code/modules/projectiles/projectile/bullets/lmg.dm +++ b/code/modules/projectiles/projectile/bullets/lmg.dm @@ -25,8 +25,10 @@ /obj/item/projectile/bullet/mm195x129 name = "1.95x129mm bullet" - damage = 45 + damage = 40 armour_penetration = 5 + wound_bonus = -50 + wound_falloff_tile = 0 /obj/item/projectile/bullet/mm195x129_ap name = "1.95x129mm armor-piercing bullet" @@ -35,8 +37,12 @@ /obj/item/projectile/bullet/mm195x129_hp name = "1.95x129mm hollow-point bullet" - damage = 60 + damage = 50 armour_penetration = -60 + sharpness = SHARP_EDGED + wound_bonus = -40 + bare_wound_bonus = 30 + wound_falloff_tile = -8 /obj/item/projectile/bullet/incendiary/mm195x129 name = "1.95x129mm incendiary bullet" diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm index 38c9c9f7d9..23a749415c 100644 --- a/code/modules/projectiles/projectile/bullets/pistol.dm +++ b/code/modules/projectiles/projectile/bullets/pistol.dm @@ -3,11 +3,13 @@ /obj/item/projectile/bullet/c9mm name = "9mm bullet" damage = 20 + embedding = list(embed_chance=15, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10) /obj/item/projectile/bullet/c9mm_ap name = "9mm armor-piercing bullet" damage = 15 armour_penetration = 40 + embedding = null /obj/item/projectile/bullet/incendiary/c9mm name = "9mm incendiary bullet" diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm index c793e9f95e..95d43ba1ce 100644 --- a/code/modules/projectiles/projectile/bullets/revolver.dm +++ b/code/modules/projectiles/projectile/bullets/revolver.dm @@ -19,8 +19,9 @@ ricochet_chance = 50 ricochet_auto_aim_angle = 10 ricochet_auto_aim_range = 3 - wound_bonus = -35 - sharpness = TRUE + wound_bonus = -20 + bare_wound_bonus = 10 + embedding = list(embed_chance=15, fall_chance=2, jostle_chance=2, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=3, jostle_pain_mult=5, rip_time=10) /obj/item/projectile/bullet/c38/match name = ".38 Match bullet" @@ -43,13 +44,21 @@ ricochet_chance = 130 ricochet_decay_damage = 0.8 shrapnel_type = NONE + sharpness = SHARP_NONE + embedding = null +// premium .38 ammo from cargo, weak against armor, lower base damage, but excellent at embedding and causing slice wounds at close range /obj/item/projectile/bullet/c38/dumdum name = ".38 DumDum bullet" damage = 15 armour_penetration = -30 ricochets_max = 0 - shrapnel_type = /obj/item/shrapnel/bullet/c38/dumdum + sharpness = SHARP_EDGED + wound_bonus = 20 + bare_wound_bonus = 20 + embedding = list(embed_chance=75, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10) + wound_falloff_tile = -5 + embed_falloff_tile = -15 /obj/item/projectile/bullet/c38/rubber name = ".38 rubber bullet" @@ -102,6 +111,7 @@ /obj/item/projectile/bullet/a357 name = ".357 bullet" damage = 60 + wound_bonus = -70 /obj/item/projectile/bullet/a357/ap name = ".357 armor-piercing bullet" diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index ae1611cb00..ce30f5e787 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -3,12 +3,15 @@ /obj/item/projectile/bullet/a556 name = "5.56mm bullet" damage = 35 + wound_bonus = -40 // 7.62 (Nagant Rifle) /obj/item/projectile/bullet/a762 name = "7.62 bullet" damage = 60 + wound_bonus = -35 + wound_falloff_tile = 0 /obj/item/projectile/bullet/a762_enchanted name = "enchanted 7.62 bullet" diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 6e4a72aff0..69f976d213 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -1,23 +1,26 @@ /obj/item/projectile/bullet/shotgun_slug name = "12g shotgun slug" - damage = 60 + damage = 50 + sharpness = SHARP_POINTY + wound_bonus = 0 /obj/item/projectile/bullet/shotgun_slug/executioner name = "executioner slug" // admin only, can dismember limbs - sharpness = TRUE - wound_bonus = 0 + sharpness = SHARP_EDGED + wound_bonus = 80 /obj/item/projectile/bullet/shotgun_slug/pulverizer name = "pulverizer slug" // admin only, can crush bones - sharpness = FALSE - wound_bonus = 0 + sharpness = SHARP_NONE + wound_bonus = 80 /obj/item/projectile/bullet/shotgun_beanbag name = "beanbag slug" damage = 10 stamina = 70 wound_bonus = 20 - sharpness = FALSE + sharpness = SHARP_NONE + embedding = null /obj/item/projectile/bullet/incendiary/shotgun name = "incendiary slug" @@ -83,18 +86,22 @@ return BULLET_ACT_HIT /obj/item/projectile/bullet/pellet - var/tile_dropoff = 0.75 + var/tile_dropoff = 0.45 var/tile_dropoff_s = 1.25 /obj/item/projectile/bullet/pellet/shotgun_buckshot name = "buckshot pellet" - damage = 12.5 - wound_bonus = -10 + damage = 7.5 + wound_bonus = 5 + bare_wound_bonus = 5 + wound_falloff_tile = -2.5 // low damage + additional dropoff will already curb wounding potential anything past point blank /obj/item/projectile/bullet/pellet/shotgun_rubbershot name = "rubbershot pellet" damage = 2 stamina = 15 + sharpness = SHARP_NONE + embedding = null /obj/item/projectile/bullet/pellet/Range() ..() @@ -106,8 +113,10 @@ qdel(src) /obj/item/projectile/bullet/pellet/shotgun_improvised - tile_dropoff = 0.55 //Come on it does 6 damage don't be like that. + tile_dropoff = 0.35 //Come on it does 6 damage don't be like that. damage = 6 + wound_bonus = 0 + bare_wound_bonus = 7.5 /obj/item/projectile/bullet/pellet/shotgun_improvised/Initialize() . = ..() diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index eb4c8e9776..5c9d5b92a3 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -3,6 +3,8 @@ /obj/item/projectile/bullet/c45 name = ".45 bullet" damage = 30 + wound_bonus = -10 + wound_falloff_tile = -10 /obj/item/projectile/bullet/c45_cleaning name = ".45 bullet" @@ -51,11 +53,15 @@ /obj/item/projectile/bullet/c46x30mm name = "4.6x30mm bullet" damage = 15 + wound_bonus = -5 + bare_wound_bonus = 5 + embed_falloff_tile = -4 /obj/item/projectile/bullet/c46x30mm_ap name = "4.6x30mm armor-piercing bullet" damage = 12.5 armour_penetration = 40 + embedding = null /obj/item/projectile/bullet/incendiary/c46x30mm name = "4.6x30mm incendiary bullet" diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 0c3de579b6..103061088e 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -217,6 +217,9 @@ /datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/M) if(HAS_TRAIT(M, TRAIT_CALCIUM_HEALER)) M.heal_bodypart_damage(1.5,0, 0) + for(var/i in M.all_wounds) + var/datum/wound/iter_wound = i + iter_wound.on_xadone(2) . = 1 else if(M.getBruteLoss() && prob(20)) @@ -320,6 +323,83 @@ ..() . = 1 +/datum/reagent/consumable/tea/red + name = "Red Tea" + description = "Tasty red tea, helps the body digest food. Drink in moderation!" + color = "#101000" // rgb: 16, 16, 0 + nutriment_factor = 0 + taste_description = "sweet red tea" + glass_icon_state = "teaglass" + glass_name = "glass of red tea" + glass_desc = "A piping hot tea that helps with the digestion of food." + +/datum/reagent/consumable/tea/red/on_mob_life(mob/living/carbon/M) + if(M.nutrition > NUTRITION_LEVEL_HUNGRY) + M.adjust_nutrition(-3) + M.dizziness = max(0,M.dizziness-2) + M.drowsyness = max(0,M.drowsyness-1) + M.jitteriness = max(0,M.jitteriness-3) + M.adjust_bodytemperature(23 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL) + . = 1 + +/datum/reagent/consumable/tea/green + name = "Green Tea" + description = "Tasty green tea, known to heal livers, it's good for you!" + color = "#101000" // rgb: 16, 16, 0 + nutriment_factor = 0 + taste_description = "tart green tea" + glass_icon_state = "teaglass" + glass_name = "glass of tea" + glass_desc = "A calming glass of green tea to help get you through the day." + +/datum/reagent/consumable/tea/green/on_mob_life(mob/living/carbon/M) + M.adjustOrganLoss(ORGAN_SLOT_LIVER, -0.5) //Detox! + M.dizziness = max(0,M.dizziness-2) + M.drowsyness = max(0,M.drowsyness-1) + M.jitteriness = max(0,M.jitteriness-3) + M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL) + . = 1 + +/datum/reagent/consumable/tea/forest + name = "Forest Tea" + description = "Tea mixed with honey, has both antitoxins and sweetness in one!" + color = "#101000" // rgb: 16, 16, 0 + nutriment_factor = 0 + quality = DRINK_NICE + taste_description = "sweet tea" + glass_icon_state = "teaglass" + glass_name = "glass of forest tea" + glass_desc = "A lovely glass of tea and honey." + +/datum/reagent/consumable/tea/forest/on_mob_life(mob/living/carbon/M) + if(M.getToxLoss() && prob(40))//Two anti-toxins working here + M.adjustToxLoss(-1, 0, TRUE) //heals TOXINLOVERs + //Reminder that honey heals toxin lovers + M.dizziness = max(0,M.dizziness-2) + M.drowsyness = max(0,M.drowsyness-1) + M.jitteriness = max(0,M.jitteriness-3) + M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL) + . = 1 + +/datum/reagent/consumable/tea/mush + name = "Mush Tea" + description = "Tea mixed with mushroom hallucinogen, used for fun rides or self reflection." + color = "#101000" // rgb: 16, 16, 0 + nutriment_factor = 0 + quality = DRINK_NICE + taste_description = "fungal infections" + glass_icon_state = "teaglass" + glass_name = "glass of mush tea" + glass_desc = "A cold merky brown tea." + +/datum/reagent/consumable/tea/mush/on_mob_life(mob/living/carbon/M) + M.set_drugginess(20) //Little better then space drugs + if(prob(20)) + M.Dizzy(10) + if(prob(10)) + M.disgust = 0 + . = 1 + /datum/reagent/consumable/lemonade name = "Lemonade" description = "Sweet, tangy lemonade. Good for the soul." @@ -1013,4 +1093,23 @@ if(M.getToxLoss() && prob(30)) M.adjustToxLoss(-1, 0) ..() - . = TRUE \ No newline at end of file + . = TRUE + +// i googled "natural coagulant" and a couple of results came up for banana peels, so after precisely 30 more seconds of research, i now dub grinding banana peels good for your blood +/datum/reagent/consumable/banana_peel + name = "Pulped Banana Peel" + description = "Okay, so you put a banana peel in a grinder... Why, exactly?" + color = "#863333" // rgb: 175, 175, 0 + reagent_state = SOLID + taste_description = "stringy, bitter pulp" + glass_name = "glass of banana peel pulp" + glass_desc = "Okay, so you put a banana peel in a grinder... Why, exactly?" + +/datum/reagent/consumable/baked_banana_peel + name = "Baked Banana Peel Powder" + description = "You took a banana peel... pulped it... baked it... Where are you going with this?" + color = "#863333" // rgb: 175, 175, 0 + reagent_state = SOLID + taste_description = "bitter powder" + glass_name = "glass of banana peel powder" + description = "You took a banana peel... pulped it... baked it... Where are you going with this?" diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 050b1f29b5..8bb34c0a82 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -145,8 +145,8 @@ M.adjustToxLoss(-power, 0, TRUE) //heals TOXINLOVERs M.adjustCloneLoss(-power, 0) for(var/i in M.all_wounds) - var/datum/wound/W = i - W.on_xadone(power) + var/datum/wound/iter_wound = i + iter_wound.on_xadone(power) REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC) //fixes common causes for disfiguration . = 1 metabolization_rate = REAGENTS_METABOLISM * (0.00001 * (M.bodytemperature ** 2) + 0.5) @@ -196,8 +196,8 @@ M.adjustToxLoss(-power, 0, TRUE) M.adjustCloneLoss(-power, 0) for(var/i in M.all_wounds) - var/datum/wound/W = i - W.on_xadone(power) + var/datum/wound/iter_wound = i + iter_wound.on_xadone(power) REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC) . = 1 ..() @@ -365,7 +365,7 @@ /datum/reagent/medicine/salglu_solution name = "Saline-Glucose Solution" - description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a temporary blood substitute." + description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a temporary blood substitute, as well as slowly speeding blood regeneration." reagent_state = LIQUID color = "#DCDCDC" metabolization_rate = 0.5 * REAGENTS_METABOLISM @@ -373,6 +373,7 @@ taste_description = "sweetness and salt" var/last_added = 0 var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10 //So that normal blood regeneration can continue with salglu active + var/extra_regen = 0.25 // in addition to acting as temporary blood, also add this much to their actual blood per tick pH = 5.5 /datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/M) @@ -385,7 +386,7 @@ var/amount_to_add = min(M.blood_volume, volume*5) var/new_blood_level = min(M.blood_volume + amount_to_add, maximum_reachable) last_added = new_blood_level - M.blood_volume - M.blood_volume = new_blood_level + M.blood_volume = new_blood_level + extra_regen if(prob(33)) M.adjustBruteLoss(-0.5*REM, 0) M.adjustFireLoss(-0.5*REM, 0) @@ -471,8 +472,9 @@ else if(method in list(PATCH, TOUCH)) M.adjustBruteLoss(-1 * reac_volume) M.adjustFireLoss(-1 * reac_volume) - for(var/datum/wound/burn/burn_wound in C.all_wounds) - burn_wound.regenerate_flesh(reac_volume) + for(var/i in C.all_wounds) + var/datum/wound/iter_wound = i + iter_wound.on_synthflesh(reac_volume) if(show_message) to_chat(M, "You feel your burns and bruises healing! It stings like hell!") SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) @@ -1592,10 +1594,56 @@ to_chat(C, "[pick(GLOB.wisdoms)]") //give them a random wisdom ..() -// handled in cut wounds process +// helps bleeding wounds clot faster /datum/reagent/medicine/coagulant name = "Sanguirite" - description = "A coagulant used to help open cuts clot faster." + description = "A proprietary coagulant used to help bleeding wounds clot faster." reagent_state = LIQUID color = "#bb2424" metabolization_rate = 0.25 * REAGENTS_METABOLISM + overdose_threshold = 20 + /// How much base clotting we do per bleeding wound, multiplied by the below number for each bleeding wound + var/clot_rate = 0.25 + /// If we have multiple bleeding wounds, we count the number of bleeding wounds, then multiply the clot rate by this^(n) before applying it to each cut, so more cuts = less clotting per cut (though still more total clotting) + var/clot_coeff_per_wound = 0.9 + +/datum/reagent/medicine/coagulant/on_mob_life(mob/living/carbon/M) + . = ..() + if(!M.blood_volume || !M.all_wounds) + return + + var/effective_clot_rate = clot_rate + + for(var/i in M.all_wounds) + var/datum/wound/iter_wound = i + if(iter_wound.blood_flow) + effective_clot_rate *= clot_coeff_per_wound + + for(var/i in M.all_wounds) + var/datum/wound/iter_wound = i + iter_wound.blood_flow = max(0, iter_wound.blood_flow - effective_clot_rate) + +/datum/reagent/medicine/coagulant/overdose_process(mob/living/M) + . = ..() + if(!M.blood_volume) + return + + if(prob(15)) + M.losebreath += rand(2,4) + M.adjustOxyLoss(rand(1,3)) + if(prob(30)) + to_chat(M, "You can feel your blood clotting up in your veins!") + else if(prob(10)) + to_chat(M, "You feel like your blood has stopped moving!") + if(prob(50)) + var/obj/item/organ/lungs/our_lungs = M.getorganslot(ORGAN_SLOT_LUNGS) + our_lungs.applyOrganDamage(1) + else + var/obj/item/organ/heart/our_heart = M.getorganslot(ORGAN_SLOT_HEART) + our_heart.applyOrganDamage(1) + +// can be synthesized on station rather than bought. made by grinding a banana peel, heating it up, then mixing the banana peel powder with salglu +/datum/reagent/medicine/coagulant/weak + name = "Synthi-Sanguirite" + description = "A synthetic coagulant used to help bleeding wounds clot faster. Not quite as effective as name brand Sanguirite, especially on patients with lots of cuts." + clot_coeff_per_wound = 0.8 diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index d828c2e021..4ade7607c6 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -244,6 +244,11 @@ glass_desc = "The father of all refreshments." shot_glass_icon_state = "shotglassclear" +/datum/reagent/water/on_mob_life(mob/living/carbon/M) + . = ..() + if(M.blood_volume) + M.blood_volume += 0.1 // water is good for you! + /* * Water reaction to turf */ @@ -334,6 +339,8 @@ return ..() /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M) + if(M.blood_volume) + M.blood_volume += 0.1 // water is good for you! if(!data) data = list("misc" = 1) data["misc"]++ @@ -2356,6 +2363,7 @@ metabolization_rate = 0.75 * REAGENTS_METABOLISM // 5u (WOUND_DETERMINATION_CRITICAL) will last for ~17 ticks /// Whether we've had at least WOUND_DETERMINATION_SEVERE (2.5u) of determination at any given time. No damage slowdown immunity or indication we're having a second wind if it's just a single moderate wound var/significant = FALSE + self_consuming = TRUE /datum/reagent/determination/on_mob_end_metabolize(mob/living/carbon/M) if(significant) @@ -2389,7 +2397,6 @@ color = "#E6E6DA" taste_mult = 0 - /datum/reagent/hairball name = "Hairball" description = "A bundle of keratinous bits and fibers, not easily digestible." @@ -2437,4 +2444,4 @@ M.reagents.del_reagent(/datum/reagent/hairball) return ..() - + diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 7da734e9c4..8dca028b4a 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -373,6 +373,14 @@ pH = 4.9 value = REAGENT_VALUE_VERY_COMMON +/datum/reagent/toxin/teapowder/red + name = "Ground Red Tea Leaves" + toxpwr = 0.4 + +/datum/reagent/toxin/teapowder/green + name = "Ground Green Tea Leaves" + toxpwr = 0.6 + /datum/reagent/toxin/mutetoxin //the new zombie powder. name = "Mute Toxin" description = "A nonlethal poison that inhibits speech in its victim." diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index e591daeb8e..bb9a951cac 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -50,6 +50,18 @@ results = list(/datum/reagent/medicine/salglu_solution = 3) required_reagents = list(/datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/water = 1, /datum/reagent/consumable/sugar = 1) +/datum/chemical_reaction/baked_banana_peel + results = list(/datum/reagent/consumable/baked_banana_peel = 1) + required_temp = 413.15 // if it's good enough for caramel it's good enough for this + required_reagents = list(/datum/reagent/consumable/banana_peel = 1) + mix_message = "The pulp dries up and takes on a powdery state!" + mob_react = FALSE + +/datum/chemical_reaction/coagulant_weak + results = list(/datum/reagent/medicine/coagulant/weak = 3) + required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/consumable/baked_banana_peel = 1) + mob_react = FALSE + /datum/chemical_reaction/mine_salve name = "Miner's Salve" id = /datum/reagent/medicine/mine_salve diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 27db55d7af..835ffe2d89 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -135,11 +135,18 @@ /obj/item/reagent_containers/hypospray/medipen/ekit name = "emergency first-aid autoinjector" - desc = "An epinephrine medipen with trace amounts of coagulants and antibiotics to help stabilize bad cuts and burns." + desc = "An epinephrine medipen with extra coagulant and antibiotics to help stabilize bad cuts and burns." volume = 15 amount_per_transfer_from_this = 15 list_reagents = list(/datum/reagent/medicine/epinephrine = 12, /datum/reagent/medicine/coagulant = 2.5, /datum/reagent/medicine/spaceacillin = 0.5) +/obj/item/reagent_containers/hypospray/medipen/blood_loss + name = "hypovolemic-response autoinjector" + desc = "A medipen designed to stabilize and rapidly reverse severe bloodloss." + volume = 15 + amount_per_transfer_from_this = 15 + list_reagents = list(/datum/reagent/medicine/epinephrine = 5, /datum/reagent/medicine/coagulant = 2.5, /datum/reagent/iron = 3.5, /datum/reagent/medicine/salglu_solution = 4) + /obj/item/reagent_containers/hypospray/medipen/stimulants name = "illegal stimpack medipen" desc = "A highly illegal medipen due to its load and small injections, allow for five uses before being drained" diff --git a/code/modules/reagents/reagent_containers/medspray.dm b/code/modules/reagents/reagent_containers/medspray.dm index 02a3f987bc..40ad167531 100644 --- a/code/modules/reagents/reagent_containers/medspray.dm +++ b/code/modules/reagents/reagent_containers/medspray.dm @@ -32,6 +32,9 @@ to_chat(user, "You will now apply the medspray's contents in [squirt_mode ? "short bursts":"extended sprays"]. You'll now use [amount_per_transfer_from_this] units per use.") /obj/item/reagent_containers/medspray/attack(mob/living/L, mob/user, def_zone) + INVOKE_ASYNC(src, .proc/attempt_spray, L, user, def_zone) // this is shitcode because the params for attack aren't even right but i'm not in the mood to refactor right now. + +/obj/item/reagent_containers/medspray/proc/attempt_spray(mob/living/L, mob/user, def_zone) if(!reagents || !reagents.total_volume) to_chat(user, "[src] is empty!") return diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 0220802c3e..f42ae668c7 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -16,6 +16,7 @@ custom_materials = list(/datum/material/iron=10, /datum/material/glass=20) reagent_flags = TRANSPARENT custom_price = PRICE_CHEAP_AS_FREE + sharpness = SHARP_POINTY /obj/item/reagent_containers/syringe/Initialize() . = ..() @@ -52,6 +53,9 @@ /obj/item/reagent_containers/syringe/attackby(obj/item/I, mob/user, params) return +/obj/item/reagent_containers/syringe/attack() + return // no bludgeoning. + /obj/item/reagent_containers/syringe/afterattack(atom/target, mob/user, proximity) . = ..() INVOKE_ASYNC(src, .proc/attempt_inject, target, user, proximity) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 07c80322ae..3d88282937 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -86,12 +86,12 @@ /// A hat won't cover your face, but a shirt covering your chest will cover your... you know, chest var/scars_covered_by_clothes = TRUE - /// Descriptions for the locations on the limb for scars to be assigned, just cosmetic - var/list/specific_locations = list("general area") /// So we know if we need to scream if this limb hits max damage var/last_maxed /// How much generic bleedstacks we have on this bodypart var/generic_bleedstacks + /// If we have a gauze wrapping currently applied (not including splints) + var/obj/item/stack/current_gauze /obj/item/bodypart/examine(mob/user) . = ..() @@ -151,8 +151,20 @@ var/turf/T = get_turf(src) if(status != BODYPART_ROBOTIC) playsound(T, 'sound/misc/splort.ogg', 50, 1, -1) - for(var/obj/item/I in src) - I.forceMove(T) + if(current_gauze) + QDEL_NULL(current_gauze) + for(var/obj/item/organ/drop_organ in get_organs()) + drop_organ.transfer_to_limb(src, owner) + +///since organs aren't actually stored in the bodypart themselves while attached to a person, we have to query the owner for what we should have +/obj/item/bodypart/proc/get_organs() + if(!owner) + return + . = list() + for(var/i in owner.internal_organs) //internal organs inside the dismembered limb are dropped. + var/obj/item/organ/organ_check = i + if(check_zone(organ_check.zone) == body_zone) + . += organ_check /obj/item/bodypart/proc/consider_processing() if(stamina_dam > DAMAGE_PRECISION) @@ -171,7 +183,7 @@ //Applies brute and burn damage to the organ. Returns 1 if the damage-icon states changed at all. //Damage will not exceed max_damage using this proc //Cannot apply negative damage -/obj/item/bodypart/proc/receive_damage(brute = 0, burn = 0, stamina = 0, blocked = 0, updating_health = TRUE, required_status = null, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE) // maybe separate BRUTE_SHARP and BRUTE_OTHER eventually somehow hmm +/obj/item/bodypart/proc/receive_damage(brute = 0, burn = 0, stamina = 0, blocked = 0, updating_health = TRUE, required_status = null, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE) // maybe separate BRUTE_SHARP and BRUTE_OTHER eventually somehow hmm if(owner && (owner.status_flags & GODMODE)) return FALSE //godmode var/dmg_mlt = CONFIG_GET(number/damage_multiplier) @@ -192,16 +204,64 @@ if(ALIEN_BODYPART,LARVA_BODYPART) //aliens take some additional burn //nothing can burn with so much snowflake code around burn *= 1.2 - var/wounding_type = (brute > burn ? WOUND_BRUTE : WOUND_BURN) + /* + // START WOUND HANDLING + */ + + // what kind of wounds we're gonna roll for, take the greater between brute and burn, then if it's brute, we subdivide based on sharpness + var/wounding_type = (brute > burn ? WOUND_BLUNT : WOUND_BURN) var/wounding_dmg = max(brute, burn) - if(wounding_type == WOUND_BRUTE && sharpness) - wounding_type = WOUND_SHARP - // i know this is effectively the same check as above but i don't know if those can null the damage by rounding and want to be safe - if(owner && wounding_dmg > 4 && wound_bonus != CANT_WOUND) - // if you want to make tox wounds or some other type, this will need to be expanded and made more modular - // handle all our wounding stuff + var/mangled_state = get_mangled_state() + var/bio_state = owner.get_biological_state() + var/easy_dismember = HAS_TRAIT(owner, TRAIT_EASYDISMEMBER) // if we have easydismember, we don't reduce damage when redirecting damage to different types (slashing weapons on mangled/skinless limbs attack at 100% instead of 50%) + + if(wounding_type == WOUND_BLUNT) + if(sharpness == SHARP_EDGED) + wounding_type = WOUND_SLASH + else if(sharpness == SHARP_POINTY) + wounding_type = WOUND_PIERCE + + //Handling for bone only/flesh only(none right now)/flesh and bone targets + switch(bio_state) + // if we're bone only, all cutting attacks go straight to the bone + if(BIO_JUST_BONE) + if(wounding_type == WOUND_SLASH) + wounding_type = WOUND_BLUNT + wounding_dmg *= (easy_dismember ? 1 : 0.5) + else if(wounding_type == WOUND_PIERCE) + wounding_type = WOUND_BLUNT + wounding_dmg *= (easy_dismember ? 1 : 0.75) + if((mangled_state & BODYPART_MANGLED_BONE) && try_dismember(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus)) + return + // note that there's no handling for BIO_JUST_FLESH since we don't have any that are that right now (slimepeople maybe someday) + // standard humanoids + if(BIO_FLESH_BONE) + // if we've already mangled the skin (critical slash or piercing wound), then the bone is exposed, and we can damage it with sharp weapons at a reduced rate + // So a big sharp weapon is still all you need to destroy a limb + if(mangled_state == BODYPART_MANGLED_FLESH && sharpness) + playsound(src, "sound/effects/wounds/crackandbleed.ogg", 100) + if(wounding_type == WOUND_SLASH && !easy_dismember) + wounding_dmg *= 0.5 // edged weapons pass along 50% of their wounding damage to the bone since the power is spread out over a larger area + if(wounding_type == WOUND_PIERCE && !easy_dismember) + wounding_dmg *= 0.75 // piercing weapons pass along 75% of their wounding damage to the bone since it's more concentrated + wounding_type = WOUND_BLUNT + else if(mangled_state == BODYPART_MANGLED_BOTH && try_dismember(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus)) + return + + // now we have our wounding_type and are ready to carry on with wounds and dealing the actual damage + if(owner && wounding_dmg >= WOUND_MINIMUM_DAMAGE && wound_bonus != CANT_WOUND) check_wounding(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus) + for(var/i in wounds) + var/datum/wound/iter_wound = i + iter_wound.receive_damage(wounding_type, wounding_dmg, wound_bonus) + + /* + // END WOUND HANDLING + */ + + //back to our regularly scheduled program, we now actually apply damage if there's room below limb damage cap + var/can_inflict = max_damage - get_damage() var/total_damage = brute + burn @@ -213,10 +273,6 @@ if(can_inflict <= 0) return FALSE - for(var/i in wounds) - var/datum/wound/W = i - W.receive_damage(wounding_type, wounding_dmg, wound_bonus) - brute_dam += brute burn_dam += burn @@ -236,14 +292,58 @@ update_disabled() return update_bodypart_damage_state() +/// Allows us to roll for and apply a wound without actually dealing damage. Used for aggregate wounding power with pellet clouds +/obj/item/bodypart/proc/painless_wound_roll(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus, sharpness=SHARP_NONE) + if(!owner || phantom_wounding_dmg <= WOUND_MINIMUM_DAMAGE || wound_bonus == CANT_WOUND) + return + + var/mangled_state = get_mangled_state() + var/bio_state = owner.get_biological_state() + var/easy_dismember = HAS_TRAIT(owner, TRAIT_EASYDISMEMBER) // if we have easydismember, we don't reduce damage when redirecting damage to different types (slashing weapons on mangled/skinless limbs attack at 100% instead of 50%) + + if(wounding_type == WOUND_BLUNT) + if(sharpness == SHARP_EDGED) + wounding_type = WOUND_SLASH + else if(sharpness == SHARP_POINTY) + wounding_type = WOUND_PIERCE + + //Handling for bone only/flesh only(none right now)/flesh and bone targets + switch(bio_state) + // if we're bone only, all cutting attacks go straight to the bone + if(BIO_JUST_BONE) + if(wounding_type == WOUND_SLASH) + wounding_type = WOUND_BLUNT + phantom_wounding_dmg *= (easy_dismember ? 1 : 0.5) + else if(wounding_type == WOUND_PIERCE) + wounding_type = WOUND_BLUNT + phantom_wounding_dmg *= (easy_dismember ? 1 : 0.75) + if((mangled_state & BODYPART_MANGLED_BONE) && try_dismember(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus)) + return + // note that there's no handling for BIO_JUST_FLESH since we don't have any that are that right now (slimepeople maybe someday) + // standard humanoids + if(BIO_FLESH_BONE) + // if we've already mangled the skin (critical slash or piercing wound), then the bone is exposed, and we can damage it with sharp weapons at a reduced rate + // So a big sharp weapon is still all you need to destroy a limb + if(mangled_state == BODYPART_MANGLED_FLESH && sharpness) + playsound(src, "sound/effects/wounds/crackandbleed.ogg", 100) + if(wounding_type == WOUND_SLASH && !easy_dismember) + phantom_wounding_dmg *= 0.5 // edged weapons pass along 50% of their wounding damage to the bone since the power is spread out over a larger area + if(wounding_type == WOUND_PIERCE && !easy_dismember) + phantom_wounding_dmg *= 0.75 // piercing weapons pass along 75% of their wounding damage to the bone since it's more concentrated + wounding_type = WOUND_BLUNT + else if(mangled_state == BODYPART_MANGLED_BOTH && try_dismember(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus)) + return + + check_wounding(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus) + /** * check_wounding() is where we handle rolling for, selecting, and applying a wound if we meet the criteria * - * We generate a "score" for how woundable the attack was based on the damage and other factors discussed in [check_wounding_mods()], then go down the list from most severe to least severe wounds in that category. + * We generate a "score" for how woundable the attack was based on the damage and other factors discussed in [/obj/item/bodypart/proc/check_wounding_mods], then go down the list from most severe to least severe wounds in that category. * We can promote a wound from a lesser to a higher severity this way, but we give up if we have a wound of the given type and fail to roll a higher severity, so no sidegrades/downgrades * * Arguments: - * * woundtype- Either WOUND_SHARP, WOUND_BRUTE, or WOUND_BURN based on the attack type. + * * woundtype- Either WOUND_BLUNT, WOUND_SLASH, WOUND_PIERCE, or WOUND_BURN based on the attack type. * * damage- How much damage is tied to this attack, since wounding potential scales with damage in an attack (see: WOUND_DAMAGE_EXPONENT) * * wound_bonus- The wound_bonus of an attack * * bare_wound_bonus- The bare_wound_bonus of an attack @@ -252,19 +352,24 @@ // actually roll wounds if applicable if(HAS_TRAIT(owner, TRAIT_EASYLIMBDISABLE)) damage *= 1.5 + else + damage = min(damage, WOUND_MAX_CONSIDERED_DAMAGE) - var/base_roll = rand(1, round(damage ** WOUND_DAMAGE_EXPONENT)) + var/base_roll = rand(max(damage/1.5,25), round(damage ** WOUND_DAMAGE_EXPONENT)) var/injury_roll = base_roll injury_roll += check_woundings_mods(woundtype, damage, wound_bonus, bare_wound_bonus) - var/list/wounds_checking + var/list/wounds_checking = GLOB.global_wound_types[woundtype] - switch(woundtype) - if(WOUND_SHARP) - wounds_checking = WOUND_LIST_CUT - if(WOUND_BRUTE) - wounds_checking = WOUND_LIST_BONE - if(WOUND_BURN) - wounds_checking = WOUND_LIST_BURN + // quick re-check to see if bare_wound_bonus applies, for the benefit of log_wound(), see about getting the check from check_woundings_mods() somehow + if(ishuman(owner)) + var/mob/living/carbon/human/human_wearer = owner + var/list/clothing = human_wearer.clothingonpart(src) + for(var/i in clothing) + var/obj/item/clothing/clothes_check = i + // unlike normal armor checks, we tabluate these piece-by-piece manually so we can also pass on appropriate damage the clothing's limbs if necessary + if(clothes_check.armor.getRating("wound")) + bare_wound_bonus = 0 + break //cycle through the wounds of the relevant category from the most severe down for(var/PW in wounds_checking) @@ -279,21 +384,22 @@ replaced_wound = existing_wound if(initial(possible_wound.threshold_minimum) < injury_roll) + var/datum/wound/new_wound if(replaced_wound) - var/datum/wound/new_wound = replaced_wound.replace_wound(possible_wound) - log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) + new_wound = replaced_wound.replace_wound(possible_wound) + log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) // dismembering wounds are logged in the apply_wound() for loss wounds since they delete themselves immediately, these will be immediately returned else - var/datum/wound/new_wound = new possible_wound + new_wound = new possible_wound new_wound.apply_wound(src) log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) - return + return new_wound // try forcing a specific wound, but only if there isn't already a wound of that severity or greater for that type on this bodypart /obj/item/bodypart/proc/force_wound_upwards(specific_woundtype, smited = FALSE) var/datum/wound/potential_wound = specific_woundtype for(var/i in wounds) var/datum/wound/existing_wound = i - if(existing_wound.type in (initial(potential_wound.wound_type))) + if(existing_wound.wound_type == initial(potential_wound.wound_type)) if(existing_wound.severity < initial(potential_wound.severity)) // we only try if the existing one is inferior to the one we're trying to force existing_wound.replace_wound(potential_wound, smited) return @@ -301,12 +407,20 @@ var/datum/wound/new_wound = new potential_wound new_wound.apply_wound(src, smited = smited) +/** + * check_wounding_mods() is where we handle the various modifiers of a wound roll + * + * A short list of things we consider: any armor a human target may be wearing, and if they have no wound armor on the limb, if we have a bare_wound_bonus to apply, plus the plain wound_bonus + * We also flick through all of the wounds we currently have on this limb and add their threshold penalties, so that having lots of bad wounds makes you more liable to get hurt worse + * Lastly, we add the inherent wound_resistance variable the bodypart has (heads and chests are slightly harder to wound), and a small bonus if the limb is already disabled + * + * Arguments: + * * It's the same ones on [receive_damage] + */ /obj/item/bodypart/proc/check_woundings_mods(wounding_type, damage, wound_bonus, bare_wound_bonus) var/armor_ablation = 0 var/injury_mod = 0 - //var/bwb = 0 - if(owner && ishuman(owner)) var/mob/living/carbon/human/H = owner var/list/clothing = H.clothingonpart(src) @@ -314,7 +428,7 @@ var/obj/item/clothing/C = c // unlike normal armor checks, we tabluate these piece-by-piece manually so we can also pass on appropriate damage the clothing's limbs if necessary armor_ablation += C.armor.getRating("wound") - if(wounding_type == WOUND_SHARP) + if(wounding_type == WOUND_SLASH) C.take_damage_zone(body_zone, damage, BRUTE, armour_penetration) else if(wounding_type == WOUND_BURN && damage >= 10) // lazy way to block freezing from shredding clothes without adding another var onto apply_damage() C.take_damage_zone(body_zone, damage, BURN, armour_penetration) @@ -330,7 +444,7 @@ injury_mod += W.threshold_penalty var/part_mod = -wound_resistance - if(is_disabled()) + if(get_damage(TRUE) >= max_damage) part_mod += disabled_wound_penalty injury_mod += part_mod @@ -383,11 +497,11 @@ return BODYPART_DISABLED_WOUND if(can_dismember() && !HAS_TRAIT(owner, TRAIT_NODISMEMBER)) . = disabled //inertia, to avoid limbs healing 0.1 damage and being re-enabled - if((get_damage(TRUE) >= max_damage) || (HAS_TRAIT(owner, TRAIT_EASYLIMBDISABLE) && (get_damage(TRUE) >= (max_damage * 0.6)))) //Easy limb disable disables the limb at 40% health instead of 0% + if(get_damage(TRUE) >= max_damage * (HAS_TRAIT(owner, TRAIT_EASYLIMBDISABLE) ? 0.6 : 1)) //Easy limb disable disables the limb at 40% health instead of 0% if(!last_maxed) owner.emote("scream") last_maxed = TRUE - if(!is_organic_limb()) + if(!is_organic_limb() || stamina_dam >= max_damage) return BODYPART_DISABLED_DAMAGE else if(disabled && (get_damage(TRUE) <= (max_damage * 0.8))) // reenabled at 80% now instead of 50% as of wounds update last_maxed = FALSE @@ -741,17 +855,29 @@ /obj/item/bodypart/proc/get_wound_type(checking_type) if(isnull(wounds)) return - for(var/thing in wounds) - var/datum/wound/W = thing - if(istype(W, checking_type)) - return W + for(var/i in wounds) + if(istype(i, checking_type)) + return i -/// very rough start for updating efficiency and other stats on a body part whenever a wound is gained/lost -/obj/item/bodypart/proc/update_wounds() +/** + * update_wounds() is called whenever a wound is gained or lost on this bodypart, as well as if there's a change of some kind on a bone wound possibly changing disabled status + * + * Covers tabulating the damage multipliers we have from wounds (burn specifically), as well as deleting our gauze wrapping if we don't have any wounds that can use bandaging + * + * Arguments: + * * replaced- If true, this is being called from the remove_wound() of a wound that's being replaced, so the bandage that already existed is still relevant, but the new wound hasn't been added yet + */ +/obj/item/bodypart/proc/update_wounds(replaced = FALSE) var/dam_mul = 1 //initial(wound_damage_multiplier) // we can only have one wound per type, but remember there's multiple types - for(var/datum/wound/W in wounds) - dam_mul *= W.damage_mulitplier_penalty + // we can (normally) only have one wound per type, but remember there's multiple types (smites like :B:loodless can generate multiple cuts on a limb) + for(var/i in wounds) + var/datum/wound/iter_wound = i + dam_mul *= iter_wound.damage_mulitplier_penalty + + if(!LAZYLEN(wounds) && current_gauze && !replaced) + owner.visible_message("\The [current_gauze] on [owner]'s [name] fall away.", "The [current_gauze] on your [name] fall away.") + QDEL_NULL(current_gauze) wound_damage_multiplier = dam_mul update_disabled() @@ -761,8 +887,6 @@ var/bleed_rate = 0 if(generic_bleedstacks > 0) bleed_rate++ - if(brute_dam >= 40) - bleed_rate += (brute_dam * 0.008) //We want an accurate reading of .len listclearnulls(embedded_objects) @@ -773,5 +897,40 @@ for(var/thing in wounds) var/datum/wound/W = thing bleed_rate += W.blood_flow - + if(owner.mobility_flags & ~MOBILITY_STAND) + bleed_rate *= 0.75 return bleed_rate + +/** + * apply_gauze() is used to- well, apply gauze to a bodypart + * + * As of the Wounds 2 PR, all bleeding is now bodypart based rather than the old bleedstacks system, and 90% of standard bleeding comes from flesh wounds (the exception is embedded weapons). + * The same way bleeding is totaled up by bodyparts, gauze now applies to all wounds on the same part. Thus, having a slash wound, a pierce wound, and a broken bone wound would have the gauze + * applying blood staunching to the first two wounds, while also acting as a sling for the third one. Once enough blood has been absorbed or all wounds with the ACCEPTS_GAUZE flag have been cleared, + * the gauze falls off. + * + * Arguments: + * * gauze- Just the gauze stack we're taking a sheet from to apply here + */ +/obj/item/bodypart/proc/apply_gauze(obj/item/stack/gauze) + if(!istype(gauze) || !gauze.absorption_capacity) + return + QDEL_NULL(current_gauze) + current_gauze = new gauze.type(src, 1) + gauze.use(1) + +/** + * seep_gauze() is for when a gauze wrapping absorbs blood or pus from wounds, lowering its absorption capacity. + * + * The passed amount of seepage is deducted from the bandage's absorption capacity, and if we reach a negative absorption capacity, the bandages fall off and we're left with nothing. + * + * Arguments: + * * seep_amt - How much absorption capacity we're removing from our current bandages (think, how much blood or pus are we soaking up this tick?) + */ +/obj/item/bodypart/proc/seep_gauze(seep_amt = 0) + if(!current_gauze) + return + current_gauze.absorption_capacity -= seep_amt + if(current_gauze.absorption_capacity < 0) + owner.visible_message("\The [current_gauze] on [owner]'s [name] fall away in rags.", "\The [current_gauze] on your [name] fall away in rags.", vision_distance=COMBAT_MESSAGE_RANGE) + QDEL_NULL(current_gauze) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 2ce6ca8862..fa003e3f3c 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -4,7 +4,7 @@ return TRUE //Dismember a limb -/obj/item/bodypart/proc/dismember(dam_type = BRUTE) +/obj/item/bodypart/proc/dismember(dam_type = BRUTE, silent=TRUE) if(!owner) return FALSE var/mob/living/carbon/C = owner @@ -16,7 +16,8 @@ return FALSE var/obj/item/bodypart/affecting = C.get_bodypart(BODY_ZONE_CHEST) affecting.receive_damage(clamp(brute_dam/2 * affecting.body_damage_coeff, 15, 50), clamp(burn_dam/2 * affecting.body_damage_coeff, 0, 50), wound_bonus=CANT_WOUND) //Damage the chest based on limb's existing damage - C.visible_message("[C]'s [src.name] has been violently dismembered!") + if(!silent) + C.visible_message("[C]'s [name] is violently dismembered!") C.emote("scream") SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered) drop_limb() @@ -30,6 +31,7 @@ burn() return TRUE add_mob_blood(C) + C.bleed(rand(20, 40)) var/direction = pick(GLOB.cardinals) var/t_range = rand(2,max(throw_range/2, 2)) var/turf/target_turf = get_turf(src) @@ -80,8 +82,6 @@ if(organ_spilled) C.visible_message("[C]'s internal organs spill out onto the floor!") - - //limb removal. The "special" argument is used for swapping a limb with a new one without the effects of losing a limb kicking in. /obj/item/bodypart/proc/drop_limb(special, dismembered) if(!owner) @@ -153,7 +153,52 @@ forceMove(Tsec) +/** + * get_mangled_state() is relevant for flesh and bone bodyparts, and returns whether this bodypart has mangled skin, mangled bone, or both (or neither i guess) + * + * Dismemberment for flesh and bone requires the victim to have the skin on their bodypart destroyed (either a critical cut or piercing wound), and at least a hairline fracture + * (severe bone), at which point we can start rolling for dismembering. The attack must also deal at least 10 damage, and must be a brute attack of some kind (sorry for now, cakehat, maybe later) + * + * Returns: BODYPART_MANGLED_NONE if we're fine, BODYPART_MANGLED_FLESH if our skin is broken, BODYPART_MANGLED_BONE if our bone is broken, or BODYPART_MANGLED_BOTH if both are broken and we're up for dismembering + */ +/obj/item/bodypart/proc/get_mangled_state() + . = BODYPART_MANGLED_NONE + for(var/i in wounds) + var/datum/wound/iter_wound = i + if((iter_wound.wound_flags & MANGLES_BONE)) + . |= BODYPART_MANGLED_BONE + if((iter_wound.wound_flags & MANGLES_FLESH)) + . |= BODYPART_MANGLED_FLESH + +/** + * try_dismember() is used, once we've confirmed that a flesh and bone bodypart has both the skin and bone mangled, to actually roll for it + * + * Mangling is described in the above proc, [/obj/item/bodypart/proc/get_mangled_state()]. This simply makes the roll for whether we actually dismember or not + * using how damaged the limb already is, and how much damage this blow was for. If we have a critical bone wound instead of just a severe, we add +10% to the roll. + * Lastly, we choose which kind of dismember we want based on the wounding type we hit with. Note we don't care about all the normal mods or armor for this + * + * Arguments: + * * wounding_type: Either WOUND_BLUNT, WOUND_SLASH, or WOUND_PIERCE, basically only matters for the dismember message + * * wounding_dmg: The damage of the strike that prompted this roll, higher damage = higher chance + * * wound_bonus: Not actually used right now, but maybe someday + * * bare_wound_bonus: ditto above + */ +/obj/item/bodypart/proc/try_dismember(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus) + if(wounding_dmg < DISMEMBER_MINIMUM_DAMAGE) + return + + var/base_chance = wounding_dmg + (get_damage() / max_damage * 50) // how much damage we dealt with this blow, + 50% of the damage percentage we already had on this bodypart + if(locate(/datum/wound/blunt/critical) in wounds) // we only require a severe bone break, but if there's a critical bone break, we'll add 10% more + base_chance += 10 + + if(!prob(base_chance)) + return + + var/datum/wound/loss/dismembering = new + dismembering.apply_dismember(src, wounding_type) + + return TRUE //when a limb is dropped, the internal organs are removed from the mob and put into the limb /obj/item/organ/proc/transfer_to_limb(obj/item/bodypart/LB, mob/living/carbon/C) @@ -378,7 +423,7 @@ /mob/living/carbon/regenerate_limb(limb_zone, noheal) var/obj/item/bodypart/L if(get_bodypart(limb_zone)) - return 0 + return FALSE L = newBodyPart(limb_zone, 0, 0) if(L) if(!noheal) @@ -386,6 +431,8 @@ L.burn_dam = 0 L.brutestate = 0 L.burnstate = 0 - + var/datum/scar/scaries = new + var/datum/wound/loss/phantom_loss = new // stolen valor, really + scaries.generate(L, phantom_loss) L.attach_limb(src, 1) - return 1 + return TRUE diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index a67f16b934..13b1140527 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -36,11 +36,10 @@ var/custom_head wound_resistance = 10 - specific_locations = list("left eyebrow", "cheekbone", "neck", "throat", "jawline", "entire face") scars_covered_by_clothes = FALSE /obj/item/bodypart/head/can_dismember(obj/item/I) - if(!((owner.stat == DEAD) || owner.InFullCritical())) + if(owner && !((owner.stat == DEAD) || owner.InFullCritical())) return FALSE return ..() diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index a18b31e4c1..5a887ee6b7 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -12,7 +12,7 @@ var/obj/item/cavity_item /obj/item/bodypart/chest/can_dismember(obj/item/I) - if(!((owner.stat == DEAD) || owner.InFullCritical())) + if(!((owner.stat == DEAD) || owner.InFullCritical()) || !get_organs()) return FALSE return ..() diff --git a/code/modules/surgery/bone_mending.dm b/code/modules/surgery/bone_mending.dm index 81d9fa8d97..0c0083575b 100644 --- a/code/modules/surgery/bone_mending.dm +++ b/code/modules/surgery/bone_mending.dm @@ -8,7 +8,7 @@ target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD) requires_real_bodypart = TRUE - targetable_wound = /datum/wound/brute/bone/severe + targetable_wound = /datum/wound/blunt/severe /datum/surgery/repair_bone_hairline/can_start(mob/living/user, mob/living/carbon/target) if(..()) @@ -23,7 +23,7 @@ target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD) requires_real_bodypart = TRUE - targetable_wound = /datum/wound/brute/bone/critical + targetable_wound = /datum/wound/blunt/critical /datum/surgery/repair_bone_compound/can_start(mob/living/user, mob/living/carbon/target) if(..()) diff --git a/code/modules/surgery/burn_dressing.dm b/code/modules/surgery/burn_dressing.dm index 1688f7b5d1..8bfa52d245 100644 --- a/code/modules/surgery/burn_dressing.dm +++ b/code/modules/surgery/burn_dressing.dm @@ -94,7 +94,8 @@ log_combat(user, target, "dressed burns in", addition="INTENT: [uppertext(user.a_intent)]") burn_wound.sanitization += 3 burn_wound.flesh_healing += 5 - burn_wound.force_bandage(tool) + var/obj/item/bodypart/the_part = target.get_bodypart(target_zone) + the_part.apply_gauze(tool) else to_chat(user, "[target] has no burns there!") return ..() diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm index 55a656f42d..289e9df9d4 100644 --- a/code/modules/surgery/organs/tails.dm +++ b/code/modules/surgery/organs/tails.dm @@ -45,14 +45,20 @@ /obj/item/organ/tail/lizard/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) ..() if(istype(H)) - // Checks here are necessary so it wouldn't overwrite the tail of a lizard it spawned in + // Checks here are necessary so it wouldn't overwrite the tail of a lizard it spawned in //yes, the if checks may cause snowflakes so that you can't insert another person's tail (haven't actually tested it but I assume that's the result of my addition) but it makes it so never again will lizards break their spine if set_species is called twice in a row (hopefully) if(!H.dna.species.mutant_bodyparts["tail_lizard"]) - H.dna.features["tail_lizard"] = tail_type - H.dna.species.mutant_bodyparts["tail_lizard"] = tail_type + if (!H.dna.features["tail_lizard"]) + H.dna.features["tail_lizard"] = tail_type + H.dna.species.mutant_bodyparts["tail_lizard"] = tail_type + else + H.dna.species.mutant_bodyparts["tail_lizard"] = H.dna.features["tail_lizard"] if(!H.dna.species.mutant_bodyparts["spines"]) - H.dna.features["spines"] = spines - H.dna.species.mutant_bodyparts["spines"] = spines + if (!H.dna.features["spines"]) + H.dna.features["spines"] = spines + H.dna.species.mutant_bodyparts["spines"] = spines + else + H.dna.species.mutant_bodyparts["spines"] = H.dna.features["spines"] H.update_body() /obj/item/organ/tail/lizard/Remove(special = FALSE) diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm new file mode 100644 index 0000000000..12aefefc82 --- /dev/null +++ b/code/modules/surgery/repair_puncture.dm @@ -0,0 +1,108 @@ + +/////BURN FIXING SURGERIES////// + +//the step numbers of each of these two, we only currently use the first to switch back and forth due to advancing after finishing steps anyway +#define REALIGN_INNARDS 1 +#define WELD_VEINS 2 + +///// Repair puncture wounds +/datum/surgery/repair_puncture + name = "Repair puncture" + steps = list(/datum/surgery_step/incise, /datum/surgery_step/repair_innards, /datum/surgery_step/seal_veins, /datum/surgery_step/close) // repeat between steps 2 and 3 until healed + target_mobtypes = list(/mob/living/carbon) + possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD) + requires_real_bodypart = TRUE + targetable_wound = /datum/wound/pierce + +/datum/surgery/repair_puncture/can_start(mob/living/user, mob/living/carbon/target) + . = ..() + if(.) + var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected) + var/datum/wound/burn/pierce_wound = targeted_bodypart.get_wound_type(targetable_wound) + return(pierce_wound && pierce_wound.blood_flow > 0) + +//SURGERY STEPS + +///// realign the blood vessels so we can reweld them +/datum/surgery_step/repair_innards + name = "realign blood vessels" + implements = list(TOOL_HEMOSTAT = 100, TOOL_SCALPEL = 85, TOOL_WIRECUTTER = 40) + time = 3 SECONDS + +/datum/surgery_step/repair_innards/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + var/datum/wound/pierce/pierce_wound = surgery.operated_wound + if(!pierce_wound) + user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") + return + + if(pierce_wound.blood_flow <= 0) + to_chat(user, "[target]'s [parse_zone(user.zone_selected)] has no puncture to repair!") + surgery.status++ + return + + display_results(user, target, "You begin to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)]...", + "[user] begins to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)] with [tool].", + "[user] begins to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)].") + +/datum/surgery_step/repair_innards/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) + var/datum/wound/pierce/pierce_wound = surgery.operated_wound + if(!pierce_wound) + to_chat(user, "[target] has no puncture wound there!") + return ..() + + display_results(user, target, "You successfully realign some of the blood vessels in [target]'s [parse_zone(target_zone)].", + "[user] successfully realigns some of the blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] successfully realigns some of the blood vessels in [target]'s [parse_zone(target_zone)]!") + log_combat(user, target, "excised infected flesh in", addition="INTENT: [uppertext(user.a_intent)]") + surgery.operated_bodypart.receive_damage(brute=3, wound_bonus=CANT_WOUND) + pierce_wound.blood_flow -= 0.25 + return ..() + +/datum/surgery_step/repair_innards/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, var/fail_prob = 0) + . = ..() + display_results(user, target, "You jerk apart some of the blood vessels in [target]'s [parse_zone(target_zone)].", + "[user] jerks apart some of the blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] jerk apart some of the blood vessels in [target]'s [parse_zone(target_zone)]!") + surgery.operated_bodypart.receive_damage(brute=rand(4,8), sharpness=SHARP_EDGED, wound_bonus = 10) + +///// Sealing the vessels back together +/datum/surgery_step/seal_veins + name = "weld veins" // if your doctor says they're going to weld your blood vessels back together, you're either A) on SS13, or B) in grave mortal peril + implements = list(TOOL_CAUTERY = 100, /obj/item/gun/energy/laser = 90, TOOL_WELDER = 70, /obj/item = 30) + time = 4 SECONDS + +/datum/surgery_step/seal_veins/tool_check(mob/user, obj/item/tool) + if(implement_type == TOOL_WELDER || implement_type == /obj/item) + return tool.get_temperature() + + return TRUE + +/datum/surgery_step/seal_veins/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + var/datum/wound/pierce/pierce_wound = surgery.operated_wound + if(!pierce_wound) + user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") + return + display_results(user, target, "You begin to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)]...", + "[user] begins to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)] with [tool].", + "[user] begins to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)].") + +/datum/surgery_step/seal_veins/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) + var/datum/wound/pierce/pierce_wound = surgery.operated_wound + if(!pierce_wound) + to_chat(user, "[target] has no puncture there!") + return ..() + + display_results(user, target, "You successfully meld some of the split blood vessels in [target]'s [parse_zone(target_zone)] with [tool].", + "[user] successfully melds some of the split blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] successfully melds some of the split blood vessels in [target]'s [parse_zone(target_zone)]!") + log_combat(user, target, "dressed burns in", addition="INTENT: [uppertext(user.a_intent)]") + pierce_wound.blood_flow -= 0.5 + if(pierce_wound.blood_flow > 0) + surgery.status = REALIGN_INNARDS + to_chat(user, "There still seems to be misaligned blood vessels to finish...") + else + to_chat(user, "You've repaired all the internal damage in [target]'s [parse_zone(target_zone)]!") + return ..() + +#undef REALIGN_INNARDS +#undef WELD_VEINS diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 150016f570..c4ded65e9c 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -163,7 +163,7 @@ item_flags = SURGICAL_TOOL attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP_ACCURATE + sharpness = SHARP_POINTY tool_behaviour = TOOL_SCALPEL toolspeed = 1 bare_wound_bonus = 20 @@ -181,7 +181,7 @@ force = 16 toolspeed = 0.7 light_color = LIGHT_COLOR_GREEN - sharpness = IS_SHARP_ACCURATE + sharpness = SHARP_POINTY /obj/item/scalpel/advanced/Initialize() . = ..() @@ -221,7 +221,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") toolspeed = 0.5 hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP_ACCURATE + sharpness = SHARP_POINTY /obj/item/scalpel/suicide_act(mob/user) user.visible_message("[user] is slitting [user.p_their()] [pick("wrists", "throat", "stomach")] with [src]! It looks like [user.p_theyre()] trying to commit suicide!") @@ -245,11 +245,11 @@ throw_range = 5 custom_materials = list(/datum/material/iron=10000, /datum/material/glass=6000) attack_verb = list("attacked", "slashed", "sawed", "cut") - sharpness = IS_SHARP + sharpness = SHARP_EDGED tool_behaviour = TOOL_SAW toolspeed = 1 - wound_bonus = 10 - bare_wound_bonus = 15 + wound_bonus = 5 + bare_wound_bonus = 10 /obj/item/circular_saw/Initialize() . = ..() @@ -272,7 +272,7 @@ custom_materials = list(/datum/material/iron=10000, /datum/material/glass=6000) toolspeed = 0.5 attack_verb = list("attacked", "slashed", "sawed", "cut") - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/surgical_drapes name = "surgical drapes" diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm index e068094776..a43e3fc2ce 100644 --- a/code/modules/uplink/uplink_items/uplink_dangerous.dm +++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm @@ -185,6 +185,17 @@ restricted = TRUE refund_path = /obj/item/guardiancreator/tech/choose/traitor +/datum/uplink_item/dangerous/nukieguardian // just like the normal holoparasites but without the support or deffensive stands because nukies shouldnt turtle + name = "Holoparasites" + desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an \ + organic host as a home base and source of fuel. Holoparasites come in various types and share damage with their host." + item = /obj/item/storage/box/syndie_kit/nukieguardian + cost = 15 + refundable = TRUE + surplus = 50 + refund_path = /obj/item/guardiancreator/tech/choose/nukie + include_modes = list(/datum/game_mode/nuclear) + /datum/uplink_item/dangerous/machinegun name = "L6 Squad Automatic Weapon" desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \ diff --git a/code/modules/uplink/uplink_items/uplink_devices.dm b/code/modules/uplink/uplink_items/uplink_devices.dm index 5149259bb8..eddf1760ed 100644 --- a/code/modules/uplink/uplink_items/uplink_devices.dm +++ b/code/modules/uplink/uplink_items/uplink_devices.dm @@ -147,6 +147,12 @@ item = /obj/item/aiModule/syndicate cost = 9 +/datum/uplink_item/device_tools/damaged_module + name = "Damaged AI Law Upload Module" + desc = "This AI law upload module has been laying around our warehouse for god knows how long. We do not know why you would ever use this." + item = /obj/item/aiModule/core/full/damaged + cost = 5 + /datum/uplink_item/device_tools/headsetupgrade name = "Headset Upgrader" desc = "A device that can be used to make one headset immune to flashbangs." diff --git a/code/modules/uplink/uplink_items/uplink_implants.dm b/code/modules/uplink/uplink_items/uplink_implants.dm index 02b8b1e01d..bb4e0c7960 100644 --- a/code/modules/uplink/uplink_items/uplink_implants.dm +++ b/code/modules/uplink/uplink_items/uplink_implants.dm @@ -29,6 +29,13 @@ item = /obj/item/storage/box/syndie_kit/imp_freedom cost = 5 +/datum/uplink_item/implants/warp + name = "Warp Implant" + desc = "An implant injected into the body and later activated at the user's will. It will inject eigenstasium which saves the user's location and teleports them there after five seconds. Lasts only fifteen times." + item = /obj/item/storage/box/syndie_kit/imp_warp + cost = 6 + exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) + /datum/uplink_item/implants/hijack name = "Hijack Implant" desc = "An implant that will let you hack into the APCs on station, allowing you to control them at will and the machinery within those rooms." diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index a7b9b6a298..a42fe97cb4 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -530,8 +530,7 @@ GLOBAL_LIST_EMPTY(vending_products) for(var/i in C.bodyparts) var/obj/item/bodypart/squish_part = i if(squish_part.is_organic_limb()) - //var/type_wound = pick(WOUND_LIST_BONE) - var/type_wound = pick(list(/datum/wound/brute/bone/critical, /datum/wound/brute/bone/severe, /datum/wound/brute/bone/critical, /datum/wound/brute/bone/severe, /datum/wound/brute/bone/moderate)) + var/type_wound = pick(list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate)) squish_part.force_wound_upwards(type_wound) else squish_part.receive_damage(brute=30) @@ -577,7 +576,7 @@ GLOBAL_LIST_EMPTY(vending_products) "You right [src].") unbuckle_all_mobs(TRUE) - + anchored = FALSE //so you can push it back into position tilted = FALSE layer = initial(layer) diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm index ab64756868..fd555526c6 100644 --- a/code/modules/vending/coffee.dm +++ b/code/modules/vending/coffee.dm @@ -1,16 +1,20 @@ /obj/machinery/vending/coffee name = "\improper Solar's Best Hot Drinks" desc = "A vending machine which dispenses hot drinks." - product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies" + product_ads = "Just what you need!;Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies" icon_state = "coffee" icon_vend = "coffee-vend" products = list(/obj/item/reagent_containers/food/drinks/coffee = 25, /obj/item/reagent_containers/food/drinks/mug/tea = 25, + /obj/item/reagent_containers/food/drinks/mug/tea/red = 10, + /obj/item/reagent_containers/food/drinks/mug/tea/green = 10, /obj/item/reagent_containers/food/drinks/mug/coco = 25) - contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12) + contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12, + /obj/item/reagent_containers/food/drinks/mug/tea/mush = 3,) premium = list(/obj/item/reagent_containers/food/condiment/milk = 2, /obj/item/reagent_containers/food/drinks/bottle/cream = 2, - /obj/item/reagent_containers/food/condiment/sugar = 1) + /obj/item/reagent_containers/food/condiment/sugar = 1, + /obj/item/reagent_containers/food/drinks/mug/tea/forest = 3,) refill_canister = /obj/item/vending_refill/coffee default_price = PRICE_REALLY_CHEAP diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm index cf61e4b210..3a7cd4b03f 100644 --- a/code/modules/zombie/items.dm +++ b/code/modules/zombie/items.dm @@ -12,10 +12,10 @@ var/icon_right = "bloodhand_right" hitsound = 'sound/hallucinations/growl1.ogg' force = 18 - sharpness = IS_SHARP_ACCURATE //it's a claw, they're sharp. + sharpness = SHARP_POINTY //it's a claw, they're sharp. damtype = "brute" total_mass = TOTAL_MASS_HAND_REPLACEMENT - sharpness = IS_SHARP + sharpness = SHARP_EDGED wound_bonus = -30 bare_wound_bonus = 15 diff --git a/html/changelog.html b/html/changelog.html index 6994ba35a9..65a9d69167 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,69 @@ -->
+

06 August 2020

+

Auris456852 updated:

+
    +
  • Added B.O.O.P. Remote Control cartridges to the PTech.
    • +
+

Hatterhat updated:

+
    +
  • Proto-kinetic glaives! Essentially a proto-kinetic crusher with a different blade, handguard, and goliath hide grip. Expensive, but elegant.
    • +
  • Door charges no longer knock people out.
    • +
+

Ludox235 updated:

+
    +
  • You can now buy damaged AI upload modules in the traitor's uplink.
    • +
+

Seris02 updated:

+
    +
  • fixed ghost chilis
    • +
+

Trilbyspaceclone updated:

+
    +
  • 4 New blends of tea have been shipped to the station, and how to make them has been leaked!
    • +
+

b1tt3r1n0 updated:

+
    +
  • Added the warp implant
    • +
+

dapnee updated:

+
    +
  • added a hallway to telecoms for engineers to get there on meta
    • +
+

kappa-sama updated:

+
    +
  • dildo circuit assemblies
    • +
+

lolman360 updated:

+
    +
  • The Tendril-Mother on Lavaland has remembered how to make ashwalkers who know how to speak Draconic again.
    • +
+

timothyteakettle updated:

+
    +
  • nanotrasen has decided to fire all disabled members of the security division and confiscate certain sentimental items from doctors
    • +
  • the custom tongue preference now passes through cloning so you spawn with your selected tongue
    • +
  • several changes to travelling traders so they look better and spawn slightly less often
    • +
+

zeroisthebiggay updated:

+
    +
  • nukies can buy holoparasites
    • +
+ +

04 August 2020

+

Seris02 updated:

+
    +
  • lizard spines
    • +
+

timothyteakettle updated:

+
    +
  • due to further advancements in medical technology, you can now have holes poked into your body for fun and enjoyment
    • +
+

zeroisthebiggay updated:

+
    +
  • prefs for headpat wagging
    • +
+

03 August 2020

KeRSedChaplain updated: