diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 2153b90d98d..9ecf45d383e 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -165,9 +165,6 @@ GLOBAL_LIST_INIT(uplink_spawn_loc_list, list(UPLINK_PDA, UPLINK_RADIO, UPLINK_PE //Female Uniforms GLOBAL_LIST_EMPTY(female_clothing_icons) - //radical shit -GLOBAL_LIST_INIT(hit_appends, list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF")) - GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons/taser.ogg','sound/weapons/armbomb.ogg','sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg','sound/voice/hiss5.ogg','sound/voice/hiss6.ogg','sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg','sound/items/welder.ogg','sound/items/welder2.ogg','sound/machines/airlock.ogg','sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg')) diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 107af2a60fd..fb7a6293922 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -45,10 +45,7 @@ to_chat(A, "You knock [D] out with a haymaker!") D.apply_effect(200,EFFECT_KNOCKDOWN,armor_block) D.SetSleeping(100) - D.forcesay(GLOB.hit_appends) log_combat(A, D, "knocked out (boxing) ") - else if(!(D.mobility_flags & MOBILITY_STAND)) - D.forcesay(GLOB.hit_appends) return 1 /obj/item/clothing/gloves/boxing diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 7ff12aaf767..b395f6d42b9 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -240,10 +240,6 @@ playsound(src, stun_sound, 50, TRUE, -1) - if(ishuman(L)) - var/mob/living/carbon/human/H = L - H.forcesay(GLOB.hit_appends) - attack_cooldown_check = world.time + attack_cooldown ADD_TRAIT(L, TRAIT_IWASBATONED, user) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 081542b2872..a3b5454be82 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -109,7 +109,7 @@ /obj/item/tank/jetpack/suicide_act(mob/user) if (istype(user, /mob/living/carbon/human/)) var/mob/living/carbon/human/H = user - H.forcesay("WHAT THE FUCK IS CARBON DIOXIDE?") + H.say("WHAT THE FUCK IS CARBON DIOXIDE?") H.visible_message("[user] is suffocating [user.p_them()]self with [src]! It looks like [user.p_they()] didn't read what that jetpack says!") return (OXYLOSS) else diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 712f112b828..62f9efaae8c 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -323,7 +323,7 @@ /datum/outfit/hermit name = "Lavaland hermit" - uniform = /obj/item/clothing/under/color/grey/glorf + uniform = /obj/item/clothing/under/color/grey/ancient shoes = /obj/item/clothing/shoes/sneakers/black back = /obj/item/storage/backpack mask = /obj/item/clothing/mask/breath diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index b47b6ee0c59..87b1b2b9866 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -14,7 +14,7 @@ /obj/item/clothing/under/color/random/Initialize() ..() - var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - typesof(/obj/item/clothing/under/color/jumpskirt) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost) + var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - typesof(/obj/item/clothing/under/color/jumpskirt) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/ancient - /obj/item/clothing/under/color/black/ghost) if(ishuman(loc)) var/mob/living/carbon/human/H = loc H.equip_to_slot_or_del(new C(H), ITEM_SLOT_ICLOTHING) //or else you end up with naked assistants running around everywhere... @@ -65,14 +65,10 @@ icon_state = "grey_skirt" inhand_icon_state = "gy_suit" -/obj/item/clothing/under/color/grey/glorf +/obj/item/clothing/under/color/grey/ancient name = "ancient jumpsuit" desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade." -/obj/item/clothing/under/color/grey/glorf/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - owner.forcesay(GLOB.hit_appends) - return 0 - /obj/item/clothing/under/color/blue name = "blue jumpsuit" icon_state = "blue" diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm index 16320113a8b..2ff1204844a 100644 --- a/code/modules/mob/living/carbon/human/human_say.dm +++ b/code/modules/mob/living/carbon/human/human_say.dm @@ -80,27 +80,4 @@ /mob/living/carbon/human/get_alt_name() if(name != GetVoice()) - return " (as [get_id_name("Unknown")])" - -/mob/living/carbon/human/proc/forcesay(list/append) //this proc is at the bottom of the file because quote fuckery makes notepad++ cri - if(stat == CONSCIOUS) - if(client) - var/temp = winget(client, "input", "text") - var/say_starter = "Say \"" //" - if(findtextEx(temp, say_starter, 1, length(say_starter) + 1) && length(temp) > length(say_starter)) //case sensitive means - - temp = trim_left(copytext(temp, length(say_starter) + 1)) - temp = replacetext(temp, ";", "", 1, 2) //general radio - while(trim_left(temp)[1] == ":") //dept radio again (necessary) - temp = copytext_char(trim_left(temp), 3) - - if(temp[1] == "*") //emotes - return - - var/trimmed = trim_left(temp) - if(length(trimmed)) - if(append) - trimmed += pick(append) - - say(trimmed) - winset(client, "input", "text=[null]") + return " (as [get_id_name("Unknown")])"\ diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 946c3fce6f2..8469bd8a219 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1383,10 +1383,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) to_chat(user, "You knock [target] down!") var/knockdown_duration = 40 + (target.getStaminaLoss() + (target.getBruteLoss()*0.5))*0.8 //50 total damage = 40 base stun + 40 stun modifier = 80 stun duration, which is the old base duration target.apply_effect(knockdown_duration, EFFECT_KNOCKDOWN, armor_block) - target.forcesay(GLOB.hit_appends) log_combat(user, target, "got a stun punch with their previous punch") - else if(!(target.mobility_flags & MOBILITY_STAND)) - target.forcesay(GLOB.hit_appends) /datum/species/proc/spec_unarmedattacked(mob/living/carbon/human/user, mob/living/carbon/human/target) return @@ -1559,7 +1556,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/armor_block = H.run_armor_check(affecting, "melee", "Your armor has protected your [hit_area]!", "Your armor has softened a hit to your [hit_area]!",I.armour_penetration) armor_block = min(90,armor_block) //cap damage reduction at 90% - var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) var/Iwound_bonus = I.wound_bonus // this way, you can't wound with a surgical tool on help intent if they have a surgery active and are laying down, so a misclick with a circular saw on the wrong limb doesn't bleed them dry (they still get hit tho) @@ -1639,8 +1635,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) H.w_uniform.add_mob_blood(H) H.update_inv_w_uniform() - if(Iforce > 10 || Iforce >= 5 && prob(33)) - H.forcesay(GLOB.hit_appends) //forcesay checks stat already. return TRUE /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) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 69b5b92469b..dd6b0de70bc 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1708,8 +1708,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/role_restricted/ancient_jumpsuit name = "Ancient Jumpsuit" - desc = "A tattered old jumpsuit that will provide absolutely no benefit to you. It fills the wearer with a strange compulsion to blurt out 'glorf'." - item = /obj/item/clothing/under/color/grey/glorf + desc = "A tattered old jumpsuit that will provide absolutely no benefit to you." + item = /obj/item/clothing/under/color/grey/ancient cost = 20 restricted_roles = list("Assistant") surplus = 0 @@ -1931,7 +1931,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) limited_stock = 1 item = /obj/item/devices/ocd_device restricted_roles = list("Head of Personnel", "Quartermaster") - + /datum/uplink_item/role_restricted/meathook name = "Butcher's Meat Hook" desc = "A brutal cleaver on a long chain, it allows you to pull people to your location." @@ -1966,7 +1966,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Clown Costume" desc = "Nothing is more terrifying than clowns with fully automatic weaponry." item = /obj/item/storage/backpack/duffelbag/clown/syndie - + /datum/uplink_item/badass/costumes/tactical_naptime name = "Sleepy Time Pajama Bundle" desc = "Even soldiers need to get a good nights rest. Comes with blood-red pajamas, a blankie, a hot mug of cocoa and a fuzzy friend."