diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 664836aa85..8a93627ab2 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -33,7 +33,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_ears)( set name = "Show/Hide GhostEars" set category = "Preferences" set desc = "See All Speech" - // usr.client.prefs.chat_toggles ^= CHAT_GHOSTEARS // [ChillRacoon] - you will not + usr.client.prefs.chat_toggles ^= CHAT_GHOSTEARS to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Ears", "[usr.client.prefs.chat_toggles & CHAT_GHOSTEARS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 5a649bc340..4d97096445 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -8,7 +8,7 @@ if(BASHING) total_cubes += get_a_stamina(src) if(LETHAL) - if((iskindred(src) || iscathayan(src)) && (def_zone != get_bodypart(BODY_ZONE_HEAD) && def_zone != BODY_ZONE_HEAD)) + if((iskindred(src) || iscathayan(src) || isghoul(src)) && (def_zone != get_bodypart(BODY_ZONE_HEAD) && def_zone != BODY_ZONE_HEAD)) total_cubes += get_a_stamina(src) if(AGGRAVATED) if(isgarou(src) || iswerewolf(src)) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index e45e590ac4..71fc2f54d5 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -497,3 +497,18 @@ hud_used.healths.icon_state = "[icon_state]_health5" else hud_used.healths.icon_state = "[icon_state]_health6" + + +/mob/living/proc/get_health_difficulty() + if(health >= maxHealth) + return 0 + else if(health > maxHealth*0.8) + return 0 + else if(health > maxHealth*0.6) + return -1 + else if(health > maxHealth*0.4) + return -2 + else if(health > maxHealth*0.2) + return -5 + else + return -10 diff --git a/code/modules/vtmb/rolling.dm b/code/modules/vtmb/rolling.dm index 4e399d7074..346f1cdc27 100644 --- a/code/modules/vtmb/rolling.dm +++ b/code/modules/vtmb/rolling.dm @@ -333,9 +333,10 @@ SUBSYSTEM_DEF(woddices) else return 3 -/proc/secret_vampireroll(var/dices_num = 1, var/hardness = 1, var/mob/rollperformer) +/proc/secret_vampireroll(var/dices_num = 1, var/hardness = 1, var/mob/living/rollperformer) hardness = clamp(hardness, 1, 10) - dices_num = max(1, dices_num) + var/dices_decap = rollperformer.get_health_difficulty() + dices_num = max(1, dices_num-dices_decap) var/wins = 0 var/crits = 0 var/brokes = 0 diff --git a/code/modules/wod13/ammostack.dm b/code/modules/wod13/ammostack.dm index 8cd1ffda83..5069246fb7 100644 --- a/code/modules/wod13/ammostack.dm +++ b/code/modules/wod13/ammostack.dm @@ -105,7 +105,7 @@ bare_wound_bonus = 5 wound_bonus = 0 -/obj/projectile/beam/beam_rifle/vampire/vamp12g/on_hit(atom/target, blocked = FALSE) +/obj/projectile/beam/beam_rifle/vampire/shotpellet/on_hit(atom/target, blocked = FALSE) . = ..() if(iscarbon(target)) var/mob/living/carbon/M = target diff --git a/code/modules/wod13/car.dm b/code/modules/wod13/car.dm index 25460c6b15..f1dfc52754 100644 --- a/code/modules/wod13/car.dm +++ b/code/modules/wod13/car.dm @@ -574,10 +574,10 @@ SUBSYSTEM_DEF(carpool) NPC.Aggro(driver, TRUE) playsound(src, 'code/modules/wod13/sounds/bump.ogg', 50, TRUE) if(istype(A, /mob/living)) - var/dam = prev_speed*5 + var/dam = prev_speed*2 get_damage(dam, A, dam) else - var/dam = prev_speed*5 + var/dam = prev_speed*2 get_damage(dam, , dam) return diff --git a/code/modules/wod13/cargo.dm b/code/modules/wod13/cargo.dm index 70f79b1f68..8b12176c96 100644 --- a/code/modules/wod13/cargo.dm +++ b/code/modules/wod13/cargo.dm @@ -288,7 +288,7 @@ contains = list(/obj/item/ammo_box/vampire/c12g) crate_name = "ammo crate" -/datum/supply_pack/vampire/ammo12g +/datum/supply_pack/vampire/ammo12gbuck name = "Ammo (12g, buckshot)" desc = "Contains a box of 12g 00 buckshot shells." cost = 400