diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index 54dc988c2423e..e92b6fd23105c 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -693,22 +693,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"cb" = (
-/obj/structure/closet/crate/miningcar{
- name = "Mining cart"
- },
-/obj/item/pickaxe{
- attack_verb = list("ineffectively hit");
- desc = "A pickaxe thats been left to rust.";
- force = 1;
- name = "rusty pickaxe";
- pixel_x = 5;
- throwforce = 1
- },
-/turf/open/floor/plating/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_two)
"cc" = (
/obj/structure/ore_box,
/turf/open/floor/plating/asteroid/basalt{
@@ -733,11 +717,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
-"cf" = (
-/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_two)
"cg" = (
/turf/closed/wall,
/area/awaymission/caves/research)
@@ -773,27 +752,6 @@
"cm" = (
/turf/closed/mineral/random/low_chance,
/area/awaymission/caves/BMP_asteroid/level_two)
-"cn" = (
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"co" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/filingcabinet,
-/obj/item/paper/fluff/awaymissions/caves/omega,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"cp" = (
-/obj/structure/table,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
"cq" = (
/obj/structure/flora/rock,
/turf/open/floor/plating/asteroid/basalt{
@@ -811,37 +769,12 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
-"ct" = (
-/obj/item/shard,
-/obj/item/stack/rods,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"cu" = (
-/obj/effect/decal/cleanable/blood/gibs,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"cv" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
"cw" = (
/obj/item/stack/rods,
/turf/open/floor/plating{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
-"cx" = (
-/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
"cy" = (
/obj/effect/decal/remains/human,
/turf/open/floor/plating/asteroid/basalt{
@@ -869,30 +802,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
-"cC" = (
-/obj/structure/table,
-/obj/item/restraints/handcuffs/cable,
-/obj/item/restraints/handcuffs/cable,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"cD" = (
-/obj/effect/decal/remains/human,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"cE" = (
-/obj/structure/sign/warning/vacuum{
- name = "\improper LOW AIR AREA";
- pixel_x = 32
- },
-/obj/item/stack/rods,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
"cF" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
@@ -956,19 +865,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
-"cQ" = (
-/obj/item/pickaxe{
- attack_verb = list("ineffectively hit");
- desc = "A pickaxe thats been left to rust.";
- force = 1;
- name = "rusty pickaxe";
- pixel_x = 5;
- throwforce = 1
- },
-/turf/open/floor/plating/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_two)
"cR" = (
/obj/effect/landmark/awaystart,
/turf/open/floor/plating{
@@ -1019,42 +915,12 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
-"cX" = (
-/obj/structure/table,
-/obj/item/melee/baton,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"cY" = (
-/obj/structure/glowshroom/single,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"cZ" = (
-/obj/structure/sign/warning/vacuum{
- name = "\improper LOW AIR AREA";
- pixel_x = 32
- },
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
"da" = (
/obj/structure/barricade/wooden,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"db" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/crap,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
"dc" = (
/obj/machinery/light/small{
dir = 8
@@ -1068,29 +934,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
-"dd" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"de" = (
-/obj/machinery/light,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
-"df" = (
-/obj/structure/closet/secure_closet/miner{
- name = "weapon equipment"
- },
-/obj/item/grenade/syndieminibomb/concussion,
-/obj/item/grenade/syndieminibomb/concussion,
-/obj/item/grenade/syndieminibomb/concussion,
-/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/research)
"dg" = (
/obj/effect/bump_teleporter{
id = "mineintrodown";
@@ -1104,25 +947,6 @@
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid/level_two)
-"di" = (
-/obj/structure/table,
-/obj/item/paper/fluff/awaymissions/caves/magma,
-/obj/item/pen,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"dj" = (
-/obj/structure/ladder/unbreakable{
- height = 2;
- id = "minedeep"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"dk" = (
-/obj/structure/table,
-/obj/machinery/microwave,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
"dl" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -1131,63 +955,12 @@
/obj/structure/spider/stickyweb,
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid/level_two)
-"dn" = (
-/obj/structure/chair{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"do" = (
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"dp" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets,
-/obj/item/clothing/glasses/meson,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"dq" = (
-/obj/machinery/light/small/built{
- dir = 4
- },
-/obj/structure/spider/stickyweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"dr" = (
-/obj/structure/spider/stickyweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"ds" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/pickaxe{
- attack_verb = list("ineffectively hit");
- desc = "A pickaxe thats been left to rust.";
- force = 1;
- name = "rusty pickaxe";
- pixel_x = 5;
- throwforce = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
"dt" = (
/turf/closed/wall,
/area/awaymission/caves/northblock)
"du" = (
/turf/closed/wall/rust,
/area/awaymission/caves/northblock)
-"dv" = (
-/obj/machinery/suit_storage_unit/mining{
- desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
- name = "rusted suit storage unit"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
-"dw" = (
-/obj/structure/bed,
-/obj/item/bedsheet,
-/obj/effect/landmark/awaystart,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid/level_two)
"dx" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/cobweb,
@@ -1262,26 +1035,6 @@
/obj/item/stack/sheet/iron,
/turf/open/floor/plating,
/area/awaymission/caves/northblock)
-"dM" = (
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
-"dN" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
-"dO" = (
-/mob/living/simple_animal/hostile/retaliate/bat{
- desc = "A rare breed of bat which roosts deep in caves.";
- name = "Cave Bat"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
-"dP" = (
-/obj/item/stack/rods,
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
"dQ" = (
/obj/machinery/door/airlock/mining{
name = "Dorm Access"
@@ -1291,14 +1044,6 @@
"dR" = (
/turf/open/floor/plating,
/area/awaymission/caves/northblock)
-"dS" = (
-/obj/machinery/light/small,
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
-"dT" = (
-/obj/structure/spider/stickyweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/northblock)
"dU" = (
/obj/structure/closet/crate/miningcar{
name = "Mining cart"
@@ -1363,16 +1108,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"eg" = (
-/obj/effect/decal/cleanable/robot_debris/old,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eh" = (
-/obj/structure/table,
-/obj/item/radio,
-/obj/item/radio,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"ei" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -1417,12 +1152,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
-"eq" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"er" = (
/obj/structure/chair/stool,
/turf/open/floor/plating,
@@ -1447,190 +1176,18 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"ev" = (
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"ew" = (
-/obj/structure/table,
-/obj/item/mining_scanner,
-/obj/item/mining_scanner,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"ex" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/survivalcapsule,
-/obj/item/extinguisher/mini,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"ey" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"ez" = (
-/obj/machinery/light/small/built{
- dir = 1
- },
-/obj/machinery/suit_storage_unit/mining{
- desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
- name = "rusted suit storage unit"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eA" = (
-/obj/structure/table,
-/obj/item/paper/fluff/awaymissions/caves/work_notice,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eB" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eC" = (
-/obj/structure/table,
-/obj/item/gps/mining,
-/obj/item/gps/mining,
-/obj/item/clothing/glasses/meson,
-/obj/item/clothing/glasses/meson,
-/obj/item/clothing/glasses/meson,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eD" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/item/survivalcapsule,
-/obj/item/extinguisher/mini,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eE" = (
-/obj/effect/landmark/awaystart,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"eF" = (
/turf/closed/wall,
/area/awaymission/caves/listeningpost)
"eG" = (
/turf/closed/wall/rust,
/area/awaymission/caves/listeningpost)
-"eH" = (
-/obj/machinery/vending/sustenance,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eI" = (
-/obj/structure/closet/crate/trashcart,
-/obj/item/switchblade,
-/obj/item/switchblade,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eJ" = (
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eK" = (
-/obj/structure/table,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eL" = (
-/obj/machinery/vending/sovietsoda,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eM" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical,
-/obj/item/multitool,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eN" = (
-/obj/effect/decal/cleanable/oil,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eO" = (
-/obj/effect/landmark/awaystart,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eP" = (
-/obj/structure/table,
-/obj/item/pickaxe{
- attack_verb = list("ineffectively hit");
- desc = "A pickaxe thats been left to rust.";
- force = 1;
- name = "rusty pickaxe";
- pixel_x = 5;
- throwforce = 1
- },
-/obj/item/pickaxe{
- attack_verb = list("ineffectively hit");
- desc = "A pickaxe thats been left to rust.";
- force = 1;
- name = "rusty pickaxe";
- pixel_x = 5;
- throwforce = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
"eQ" = (
/obj/machinery/mineral/mint,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"eR" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eS" = (
-/obj/machinery/light/small/built,
-/obj/machinery/suit_storage_unit/mining{
- desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
- name = "rusted suit storage unit"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eT" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"eU" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eV" = (
-/obj/structure/closet/crate/bin,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eW" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eX" = (
-/obj/structure/table,
-/obj/item/paper/pamphlet/gateway,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eY" = (
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"eZ" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
-"fa" = (
-/obj/structure/noticeboard{
- pixel_y = 32
- },
-/obj/item/paper/fluff/awaymissions/caves/shipment_notice,
-/obj/item/paper/fluff/awaymissions/caves/safety_notice,
-/turf/open/floor/iron,
-/area/awaymission/caves/listeningpost)
"fb" = (
/obj/structure/spawner/mining/hivelord,
/turf/open/floor/plating/asteroid/basalt{
@@ -1741,37 +1298,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"fq" = (
-/obj/structure/bed,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"fr" = (
-/obj/machinery/light/small/built{
- dir = 1
- },
-/obj/structure/spider/stickyweb,
-/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"fs" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"ft" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/fire,
-/obj/structure/spider/stickyweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"fu" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/brute,
-/obj/item/reagent_containers/blood/OPlus,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"fv" = (
/obj/structure/glowshroom/single,
/turf/open/floor/plating/asteroid/basalt{
@@ -1804,26 +1330,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"fA" = (
-/obj/structure/bed,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"fB" = (
-/obj/structure/spider/stickyweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"fC" = (
-/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"fD" = (
-/obj/structure/spider/stickyweb,
-/obj/machinery/sleeper{
- dir = 8
- },
-/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"fE" = (
/obj/machinery/light/small,
/turf/open/floor/plating/asteroid/basalt{
@@ -1836,13 +1342,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
-"fG" = (
-/obj/machinery/door/airlock/medical{
- name = "Medical"
- },
-/obj/structure/barricade/wooden,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"fH" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -1859,34 +1358,10 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
-"fK" = (
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"fL" = (
-/obj/structure/sign/departments/examroom{
- pixel_y = 32
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"fM" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"fN" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
-"fO" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid)
"fP" = (
/obj/structure/grille,
/turf/open/floor/plating/asteroid/basalt{
@@ -1900,47 +1375,12 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
-"fS" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/toxin,
-/obj/item/storage/firstaid/toxin,
-/obj/item/reagent_containers/blood/OPlus,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"fT" = (
-/obj/machinery/iv_drip,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"fW" = (
/obj/structure/girder,
/turf/open/floor/plating{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"fX" = (
-/obj/structure/closet/crate/miningcar{
- name = "Mining cart"
- },
-/obj/item/pickaxe{
- attack_verb = list("ineffectively hit");
- desc = "A pickaxe thats been left to rust.";
- force = 1;
- name = "rusty pickaxe";
- pixel_x = 5;
- throwforce = 1
- },
-/obj/item/stack/sheet/mineral/adamantine{
- amount = 15
- },
-/turf/open/floor/plating/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
- },
-/area/awaymission/caves/BMP_asteroid/level_two)
-"fY" = (
-/obj/structure/table,
-/obj/machinery/microwave,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"ga" = (
/obj/structure/ladder/unbreakable{
height = 2;
@@ -1950,10 +1390,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gb" = (
-/obj/structure/closet/secure_closet/freezer/kitchen,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"gc" = (
/obj/item/stack/rods,
/turf/open/floor/plating{
@@ -1977,11 +1413,6 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gf" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"gg" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/donkpockets,
@@ -2002,26 +1433,12 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gj" = (
-/obj/machinery/door/airlock/mining{
- name = "Kitchen"
- },
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"gk" = (
/obj/effect/landmark/awaystart,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
-"gl" = (
-/obj/item/trash/plate,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"gm" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"gn" = (
/obj/item/grown/log,
/turf/open/floor/plating/asteroid/basalt{
@@ -2040,217 +1457,806 @@
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gq" = (
-/obj/structure/chair/stool,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"gr" = (
-/obj/structure/table,
-/obj/item/kitchen/fork,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
"gs" = (
/obj/item/assembly/igniter,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid/level_two)
-"gt" = (
-/obj/structure/table_frame,
-/obj/item/stack/sheet/iron,
-/turf/open/floor/iron,
-/area/awaymission/caves/BMP_asteroid)
-"gu" = (
-/obj/item/stack/rods,
-/turf/open/floor/iron,
+"gz" = (
+/obj/machinery/door/airlock/external{
+ name = "Mess Hall"
+ },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
-"gv" = (
-/obj/structure/table_frame,
-/turf/open/floor/iron,
+"gD" = (
+/obj/structure/spawner/mining/hivelord,
+/turf/open/floor/plating/asteroid/basalt{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
/area/awaymission/caves/BMP_asteroid)
-"gw" = (
-/obj/structure/reagent_dispensers/beerkeg,
-/turf/open/floor/iron,
+"gH" = (
+/obj/structure/table,
+/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill,
+/obj/item/paper/fluff/awaymissions/caves/mech_notice,
+/turf/open/floor/plating,
+/area/awaymission/caves/BMP_asteroid)
+"gK" = (
+/obj/structure/girder,
+/turf/open/floor/plating,
+/area/awaymission/caves/BMP_asteroid)
+"gL" = (
+/obj/item/stack/rods,
+/turf/open/floor/plating,
+/area/awaymission/caves/BMP_asteroid)
+"gQ" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/open/floor/plating/asteroid/basalt{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"gS" = (
+/obj/structure/girder,
+/turf/open/floor/plating/asteroid/basalt{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"gT" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/awaymission/caves/BMP_asteroid)
+"gV" = (
+/obj/effect/mine/explosive{
+ desc = "Rusted mines planted out by the miners before, probably to keep the cave monsters at bay.";
+ name = "rusted mine"
+ },
+/turf/open/floor/plating/asteroid/basalt{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
/area/awaymission/caves/BMP_asteroid)
-"gx" = (
+"gX" = (
+/obj/effect/baseturf_helper/lava,
+/turf/closed/mineral/volcanic,
+/area/awaymission/caves/BMP_asteroid/level_three)
+"gY" = (
+/obj/effect/baseturf_helper/lava,
+/turf/open/lava/smooth{
+ desc = "Looks hot.";
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ luminosity = 5
+ },
+/area/awaymission/caves/BMP_asteroid/level_four)
+"gZ" = (
+/obj/effect/baseturf_helper/lava,
+/turf/closed/mineral/volcanic,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"ha" = (
+/obj/effect/baseturf_helper/lava,
+/turf/closed/mineral/volcanic,
+/area/awaymission/caves/BMP_asteroid)
+"hb" = (
+/obj/effect/baseturf_helper/asteroid/basalt,
+/turf/closed/wall,
+/area/awaymission/caves/northblock)
+"hr" = (
+/obj/machinery/vending/sustenance,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"hK" = (
+/obj/structure/spider/stickyweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"il" = (
/obj/structure/table,
-/obj/item/kitchen/fork,
-/obj/item/trash/plate,
+/obj/machinery/microwave,
/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"gy" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+"io" = (
+/obj/structure/closet/crate/trashcart,
+/obj/item/switchblade,
+/obj/item/switchblade,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"iM" = (
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
+"jc" = (
+/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"gz" = (
-/obj/machinery/door/airlock/external{
- name = "Mess Hall"
+"jg" = (
+/obj/machinery/light,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
-/turf/open/floor/plating,
+/area/awaymission/caves/research)
+"jI" = (
+/obj/structure/glowshroom/single,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"kh" = (
+/obj/machinery/light/small/built{
+ dir = 1
+ },
+/obj/machinery/suit_storage_unit/mining{
+ desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
+ name = "rusted suit storage unit"
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"kI" = (
+/obj/machinery/door/airlock/mining{
+ name = "Kitchen"
+ },
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"gA" = (
+"kP" = (
/obj/machinery/light/small{
- dir = 1
+ dir = 4
},
-/turf/open/floor/iron/dark{
+/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gB" = (
-/obj/machinery/mech_bay_recharge_port,
+"lp" = (
+/obj/structure/closet/secure_closet/miner{
+ name = "weapon equipment"
+ },
+/obj/item/grenade/syndieminibomb/concussion,
+/obj/item/grenade/syndieminibomb/concussion,
+/obj/item/grenade/syndieminibomb/concussion,
/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
+/area/awaymission/caves/research)
+"lI" = (
+/obj/structure/table_frame,
+/obj/item/stack/sheet/iron,
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"gD" = (
-/obj/structure/spawner/mining/hivelord,
-/turf/open/floor/plating/asteroid/basalt{
+"lZ" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/brute,
+/obj/item/reagent_containers/blood/OPlus,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"ml" = (
+/obj/structure/holohoop{
+ dir = 1
+ },
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"mV" = (
+/obj/structure/table,
+/obj/item/storage/box/donkpockets,
+/obj/item/clothing/glasses/meson,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"oD" = (
+/obj/effect/landmark/awaystart,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"oK" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"oX" = (
+/obj/structure/spider/stickyweb,
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"pp" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gE" = (
+"qg" = (
/obj/machinery/light/small{
dir = 4
},
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"qi" = (
+/obj/structure/sign/departments/examroom{
+ pixel_y = 32
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"qo" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/pickaxe{
+ attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
+ attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ desc = "A pickaxe thats been left to rust.";
+ force = 1;
+ name = "rusty pickaxe";
+ pixel_x = 5;
+ throwforce = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"qB" = (
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"qC" = (
+/obj/structure/table,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"qG" = (
+/obj/machinery/mech_bay_recharge_port,
/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gF" = (
+"qO" = (
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"rm" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
-/obj/item/clothing/glasses/material,
+/obj/item/storage/toolbox/mechanical,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"sm" = (
+/obj/structure/table_frame,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"sq" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"sJ" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"ti" = (
+/obj/structure/table,
+/obj/item/kitchen/fork,
+/obj/item/trash/plate,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"uh" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/fire,
+/obj/structure/spider/stickyweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"vn" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/filingcabinet,
+/obj/item/paper/fluff/awaymissions/caves/omega,
/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
-/area/awaymission/caves/BMP_asteroid)
-"gG" = (
-/obj/structure/mecha_wreckage/durand,
+/area/awaymission/caves/research)
+"vr" = (
+/obj/vehicle/sealed/mecha/working/ripley/mining,
/turf/open/floor/iron/recharge_floor,
/area/awaymission/caves/BMP_asteroid)
-"gH" = (
+"vQ" = (
/obj/structure/table,
-/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill,
-/obj/item/paper/fluff/awaymissions/caves/mech_notice,
-/turf/open/floor/plating,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/crap,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"ws" = (
+/turf/open/floor/plating/elevatorshaft{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ name = "elevator flooring"
+ },
/area/awaymission/caves/BMP_asteroid)
-"gI" = (
+"wG" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"wO" = (
+/obj/structure/noticeboard{
+ pixel_y = 32
+ },
+/obj/item/paper/fluff/awaymissions/caves/shipment_notice,
+/obj/item/paper/fluff/awaymissions/caves/safety_notice,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"xi" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"xx" = (
+/obj/machinery/light/small/built{
+ dir = 4
+ },
+/obj/structure/spider/stickyweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"xF" = (
+/obj/structure/reagent_dispensers/beerkeg,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"yf" = (
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid)
+"yo" = (
+/obj/item/stack/rods,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"yt" = (
+/obj/structure/spider/stickyweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"yD" = (
/obj/structure/chair/stool,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"zf" = (
+/obj/structure/table,
+/obj/item/paper/fluff/awaymissions/caves/magma,
+/obj/item/pen,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"zg" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"zH" = (
+/obj/structure/closet/crate/bin,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"zI" = (
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"zN" = (
+/obj/item/stack/rods,
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
+"Ak" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/toxin,
+/obj/item/storage/firstaid/toxin,
+/obj/item/reagent_containers/blood/OPlus,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"Bj" = (
+/obj/structure/table,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/obj/item/clothing/glasses/meson,
+/obj/item/clothing/glasses/meson,
+/obj/item/clothing/glasses/meson,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"Bm" = (
+/obj/structure/bed,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"Br" = (
+/obj/effect/landmark/awaystart,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"BW" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/clothing/glasses/material,
/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gJ" = (
+"Ca" = (
+/obj/item/trash/plate,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"Cv" = (
+/obj/effect/decal/remains/human,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"CL" = (
+/obj/structure/table,
+/obj/item/pickaxe{
+ attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
+ attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ desc = "A pickaxe thats been left to rust.";
+ force = 1;
+ name = "rusty pickaxe";
+ pixel_x = 5;
+ throwforce = 1
+ },
+/obj/item/pickaxe{
+ attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
+ attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ desc = "A pickaxe thats been left to rust.";
+ force = 1;
+ name = "rusty pickaxe";
+ pixel_x = 5;
+ throwforce = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"Dk" = (
/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
+/area/awaymission/caves/research)
+"Em" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
/area/awaymission/caves/BMP_asteroid)
-"gK" = (
-/obj/structure/girder,
-/turf/open/floor/plating,
+"Eq" = (
+/obj/structure/closet/crate/miningcar{
+ name = "Mining cart"
+ },
+/obj/item/pickaxe{
+ attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
+ attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ desc = "A pickaxe thats been left to rust.";
+ force = 1;
+ name = "rusty pickaxe";
+ pixel_x = 5;
+ throwforce = 1
+ },
+/obj/item/stack/sheet/mineral/adamantine{
+ amount = 15
+ },
+/turf/open/floor/plating/asteroid/basalt{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/BMP_asteroid/level_two)
+"Ex" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"EN" = (
+/mob/living/simple_animal/hostile/retaliate/bat{
+ desc = "A rare breed of bat which roosts deep in caves.";
+ name = "Cave Bat"
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
+"FA" = (
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"Gp" = (
+/obj/structure/table,
+/obj/item/paper/fluff/awaymissions/caves/work_notice,
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"gL" = (
-/obj/item/stack/rods,
-/turf/open/floor/plating,
+"GC" = (
+/obj/effect/landmark/awaystart,
+/turf/open/floor/plating/elevatorshaft{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ name = "elevator flooring"
+ },
/area/awaymission/caves/BMP_asteroid)
-"gM" = (
-/obj/structure/mecha_wreckage/ripley,
-/turf/open/floor/iron/recharge_floor,
+"He" = (
+/obj/machinery/iv_drip,
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"gN" = (
+"Ib" = (
/obj/structure/holohoop,
/turf/open/floor/iron/dark{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gO" = (
+"Id" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"IS" = (
+/obj/effect/decal/cleanable/blood/gibs,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"JH" = (
+/obj/machinery/door/airlock/medical{
+ name = "Medical"
+ },
+/obj/structure/barricade/wooden,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"JM" = (
+/obj/structure/closet/secure_closet/freezer/kitchen,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"Kb" = (
+/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"Kr" = (
/obj/structure/closet/emcloset,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"KG" = (
+/obj/machinery/suit_storage_unit/mining{
+ desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
+ name = "rusted suit storage unit"
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"Lc" = (
+/obj/structure/sign/warning/vacuum{
+ name = "\improper LOW AIR AREA";
+ pixel_x = 32
+ },
+/obj/item/stack/rods,
/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
+/area/awaymission/caves/research)
+"Lv" = (
+/obj/structure/closet/secure_closet/miner,
+/obj/item/survivalcapsule,
+/obj/item/extinguisher/mini,
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"gP" = (
+"My" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical,
+/obj/item/multitool,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"MG" = (
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"NB" = (
+/obj/structure/table,
+/obj/item/radio,
+/obj/item/radio,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"NX" = (
/obj/item/toy/beach_ball/holoball,
/turf/open/floor/iron/dark{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gQ" = (
-/obj/structure/spawner/mining/basilisk,
+"NY" = (
+/obj/structure/spider/stickyweb,
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
+"NZ" = (
+/obj/item/pickaxe{
+ attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
+ attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ desc = "A pickaxe thats been left to rust.";
+ force = 1;
+ name = "rusty pickaxe";
+ pixel_x = 5;
+ throwforce = 1
+ },
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
+/area/awaymission/caves/BMP_asteroid/level_two)
+"Ou" = (
+/obj/structure/bed,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"gS" = (
-/obj/structure/girder,
+"Ov" = (
+/obj/machinery/vending/sovietsoda,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"PD" = (
+/obj/structure/closet/crate/miningcar{
+ name = "Mining cart"
+ },
+/obj/item/pickaxe{
+ attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks");
+ attack_verb_simple = list("bash", "bludgeon", "thrash", "whack");
+ desc = "A pickaxe thats been left to rust.";
+ force = 1;
+ name = "rusty pickaxe";
+ pixel_x = 5;
+ throwforce = 1
+ },
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
+/area/awaymission/caves/BMP_asteroid/level_two)
+"PF" = (
+/obj/structure/table,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"QM" = (
+/obj/structure/table,
+/obj/item/melee/baton,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"QW" = (
+/obj/structure/table,
+/obj/item/mining_scanner,
+/obj/item/mining_scanner,
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"gT" = (
+"Rr" = (
/obj/machinery/light/small{
- dir = 4
+ dir = 1
},
-/turf/open/floor/plating,
+/turf/open/floor/iron,
+/area/awaymission/caves/northblock)
+"RG" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/effect/landmark/awaystart,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"RM" = (
+/obj/structure/mecha_wreckage/ripley,
+/turf/open/floor/iron/recharge_floor,
/area/awaymission/caves/BMP_asteroid)
-"gU" = (
-/obj/structure/holohoop{
- dir = 1
+"RZ" = (
+/obj/machinery/light{
+ dir = 8
},
-/turf/open/floor/iron/dark{
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"Sn" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"SZ" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
+/area/awaymission/caves/research)
+"Tc" = (
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"gV" = (
-/obj/effect/mine/explosive{
- desc = "Rusted mines planted out by the miners before, probably to keep the cave monsters at bay.";
- name = "rusted mine"
+"TC" = (
+/turf/open/floor/iron/dark{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
-/turf/open/floor/plating/asteroid/basalt{
+/area/awaymission/caves/BMP_asteroid/level_two)
+"TU" = (
+/obj/structure/closet/secure_closet/miner,
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/survivalcapsule,
+/obj/item/extinguisher/mini,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"Uu" = (
+/obj/structure/chair/stool,
+/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
-"gX" = (
-/obj/effect/baseturf_helper/lava,
-/turf/closed/mineral/volcanic,
-/area/awaymission/caves/BMP_asteroid/level_three)
-"gY" = (
-/obj/effect/baseturf_helper/lava,
-/turf/open/lava/smooth{
- desc = "Looks hot.";
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
- luminosity = 5
+"UE" = (
+/obj/structure/ladder/unbreakable{
+ height = 2;
+ id = "minedeep"
},
-/area/awaymission/caves/BMP_asteroid/level_four)
-"gZ" = (
-/obj/effect/baseturf_helper/lava,
-/turf/closed/mineral/volcanic,
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid/level_two)
-"ha" = (
-/obj/effect/baseturf_helper/lava,
-/turf/closed/mineral/volcanic,
+"Vl" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"Vq" = (
+/obj/structure/table,
+/obj/machinery/microwave,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"Vt" = (
+/obj/machinery/light/small/built,
+/obj/machinery/suit_storage_unit/mining{
+ desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
+ name = "rusted suit storage unit"
+ },
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"hb" = (
-/obj/effect/baseturf_helper/asteroid/basalt,
-/turf/closed/wall,
+"VA" = (
+/obj/structure/table,
+/obj/item/restraints/handcuffs/cable,
+/obj/item/restraints/handcuffs/cable,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
+"VV" = (
+/obj/structure/mecha_wreckage/durand,
+/turf/open/floor/iron/recharge_floor,
+/area/awaymission/caves/BMP_asteroid)
+"WK" = (
+/obj/machinery/light/small,
+/turf/open/floor/iron,
/area/awaymission/caves/northblock)
-"Eb" = (
-/obj/effect/landmark/awaystart,
-/turf/open/floor/plating/elevatorshaft{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
- name = "elevator flooring"
+"WR" = (
+/obj/structure/table,
+/obj/item/paper/pamphlet/gateway,
+/turf/open/floor/iron,
+/area/awaymission/caves/listeningpost)
+"XG" = (
+/obj/structure/table,
+/obj/item/kitchen/fork,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"XJ" = (
+/obj/effect/decal/cleanable/robot_debris/old,
+/turf/open/floor/iron,
+/area/awaymission/caves/BMP_asteroid)
+"XX" = (
+/obj/item/shard,
+/obj/item/stack/rods,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
+/area/awaymission/caves/research)
+"Yn" = (
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"KD" = (
-/obj/vehicle/sealed/mecha/working/ripley/mining,
-/turf/open/floor/iron/recharge_floor,
+"YU" = (
+/obj/machinery/light/small/built{
+ dir = 1
+ },
+/obj/structure/spider/stickyweb,
+/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
+/turf/open/floor/iron,
/area/awaymission/caves/BMP_asteroid)
-"SX" = (
-/turf/open/floor/plating/elevatorshaft{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
- name = "elevator flooring"
+"ZF" = (
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/BMP_asteroid)
+"ZI" = (
+/obj/structure/sign/warning/vacuum{
+ name = "\improper LOW AIR AREA";
+ pixel_x = 32
+ },
+/turf/open/floor/iron{
+ initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ },
+/area/awaymission/caves/research)
(1,1,1) = {"
aa
@@ -5524,8 +5530,8 @@ dt
dx
dE
dI
-dM
-dP
+iM
+zN
dI
dG
dA
@@ -5781,8 +5787,8 @@ du
dy
dy
dJ
-dM
-dM
+iM
+iM
dt
dy
dB
@@ -6038,8 +6044,8 @@ du
dz
dF
du
-dM
-dM
+iM
+iM
dt
dY
dz
@@ -6295,8 +6301,8 @@ du
du
du
dt
-dN
-dM
+Rr
+iM
du
du
du
@@ -6552,8 +6558,8 @@ du
dA
dG
dI
-dO
-dP
+EN
+zN
dI
dZ
el
@@ -6809,8 +6815,8 @@ du
dB
dy
dK
-dP
-dM
+zN
+iM
dR
ea
dy
@@ -7066,8 +7072,8 @@ dt
dz
dH
dt
-dM
-dP
+iM
+zN
dK
dF
dz
@@ -7323,8 +7329,8 @@ dt
dt
du
du
-dM
-dS
+iM
+WK
dt
dt
dt
@@ -7580,8 +7586,8 @@ dt
dC
dE
dI
-dM
-dT
+iM
+NY
dI
eb
em
@@ -7597,11 +7603,11 @@ bM
bL
bL
dW
-fq
-fA
+Ou
+Bm
dW
-fK
-fS
+MG
+Ak
dX
bL
bL
@@ -7854,11 +7860,11 @@ bL
bL
bL
dW
-fr
-fB
+YU
+hK
dW
-fL
-ev
+qi
+Yn
dX
bL
bL
@@ -8111,11 +8117,11 @@ bL
bL
bL
dX
-fs
-fC
-fG
-fB
-fT
+zg
+Kb
+JH
+hK
+He
dX
bL
bL
@@ -8368,11 +8374,11 @@ bL
bL
bL
dW
-ft
-ev
+uh
+Yn
dW
-fM
-ev
+sq
+Yn
dW
bL
bL
@@ -8607,9 +8613,9 @@ bV
bV
bV
bV
-cx
-cx
-cx
+yf
+yf
+yf
bV
bV
ef
@@ -8625,11 +8631,11 @@ bL
bL
bL
dX
-fu
-fD
+lZ
+oX
dX
-ev
-fB
+Yn
+hK
dW
bL
bL
@@ -8865,9 +8871,9 @@ bM
bV
bV
bV
-cx
-cx
-cx
+yf
+yf
+yf
cj
bV
bM
@@ -8876,11 +8882,11 @@ bM
bV
bV
cj
-cx
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
+yf
dW
dX
dX
@@ -9134,12 +9140,12 @@ bV
bV
bV
bV
-cx
-cx
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
+yf
+yf
bV
fH
ej
@@ -9395,9 +9401,9 @@ bV
bV
bV
ff
-cx
-cx
-cx
+yf
+yf
+yf
dW
fN
dX
@@ -9653,8 +9659,8 @@ bL
bL
dW
bV
-cx
-cx
+yf
+yf
fI
bV
bV
@@ -9910,8 +9916,8 @@ bL
bL
bL
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -10136,12 +10142,12 @@ bL
bL
cg
cg
-ct
-cC
+XX
+VA
cO
cT
-cX
-db
+QM
+vQ
cg
cg
bL
@@ -10167,10 +10173,10 @@ bL
bL
fg
bV
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
bV
bV
bV
@@ -10392,14 +10398,14 @@ bL
bL
bL
cg
-cn
-cu
-cD
-cu
-cn
-cY
-cn
-dd
+Dk
+IS
+Cv
+IS
+Dk
+jI
+Dk
+wG
cg
bL
bL
@@ -10413,11 +10419,11 @@ bL
bL
bL
dX
-ex
-eD
-eD
-eD
-eD
+TU
+Lv
+Lv
+Lv
+Lv
dX
bL
bL
@@ -10425,10 +10431,10 @@ bL
fg
bV
bV
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
bV
bV
bL
@@ -10445,7 +10451,7 @@ bL
bL
bL
bL
-cx
+yf
ej
bV
bM
@@ -10649,14 +10655,14 @@ bL
bL
bL
ch
-co
-cv
-cv
-cn
-cn
-cn
-cn
-de
+vn
+SZ
+SZ
+Dk
+Dk
+Dk
+Dk
+jg
ch
bL
bL
@@ -10670,11 +10676,11 @@ bL
bL
bL
dW
-ey
-ev
-ev
-ev
-eR
+jc
+Yn
+Yn
+Yn
+sJ
dX
bL
bL
@@ -10684,8 +10690,8 @@ bV
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -10702,8 +10708,8 @@ bL
bL
bL
bL
-cx
-cx
+yf
+yf
ej
bV
bM
@@ -10906,14 +10912,14 @@ bL
bL
bL
ch
-cp
-cn
-cE
-cn
-cn
-cZ
-cn
-df
+qC
+Dk
+Lc
+Dk
+Dk
+ZI
+Dk
+lp
ch
bV
bL
@@ -10927,11 +10933,11 @@ bL
bL
bL
dX
-ez
-eE
-ev
-ev
-eS
+kh
+Br
+Yn
+Yn
+Vt
dX
bL
bL
@@ -10941,12 +10947,12 @@ bV
bV
bV
bV
-cx
-cx
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
+yf
+yf
bV
bV
bV
@@ -10959,16 +10965,16 @@ bL
bL
bL
dW
-gN
-cx
+Ib
+yf
ej
bV
bM
bM
bM
bV
-cx
-gU
+yf
+ml
dW
bM
bM
@@ -11184,11 +11190,11 @@ bL
bL
bL
dX
-eA
-ev
-ev
-ev
-eT
+Gp
+Yn
+Yn
+Yn
+Kr
dW
bL
bV
@@ -11198,11 +11204,11 @@ bV
bV
bV
bV
-fO
-cx
-cx
-cx
-cx
+qg
+yf
+yf
+yf
+yf
bV
bV
ff
@@ -11216,16 +11222,16 @@ bL
bL
bL
bL
-cx
-gP
-cx
+yf
+NX
+yf
ej
bV
bV
bV
ej
-cx
-cx
+yf
+yf
bL
bM
bM
@@ -11441,11 +11447,11 @@ bL
bL
bL
dX
-ev
-ev
-ev
-ev
-ev
+Yn
+Yn
+Yn
+Yn
+Yn
eF
eG
eG
@@ -11456,8 +11462,8 @@ bV
bV
bV
dW
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -11473,16 +11479,16 @@ bL
bL
bL
bL
-cx
-cx
-cx
-fO
-cx
+yf
+yf
+yf
+qg
+yf
bV
gT
-cx
-cx
-cx
+yf
+yf
+yf
bL
bM
bM
@@ -11698,23 +11704,23 @@ dW
dX
dX
dX
-eB
+xi
dW
-eH
-eL
-ev
-eW
-eN
-eJ
-eO
+hr
+Ov
+Yn
+Ex
+qB
+qO
+oD
fh
bV
bV
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -11734,8 +11740,8 @@ fP
fP
fP
dW
-cx
-cx
+yf
+yf
dW
fP
bL
@@ -11937,8 +11943,8 @@ bV
bV
bV
cG
-cx
-cx
+yf
+yf
cG
bV
bV
@@ -11952,26 +11958,26 @@ bV
bV
bL
dW
-eg
-eq
-ev
-ev
+XJ
+RZ
+Yn
+Yn
eF
eF
eF
eG
eG
-eX
-eJ
-eJ
+WR
+qO
+qO
fh
bV
bV
bV
bV
bV
-cx
-cx
+yf
+yf
bV
cj
bV
@@ -11991,8 +11997,8 @@ bV
bV
bV
cG
-cx
-cx
+yf
+yf
cG
bV
bL
@@ -12194,8 +12200,8 @@ bV
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -12209,26 +12215,26 @@ bV
bV
bL
dX
-eh
+NB
ej
-eg
-ev
+XJ
+Yn
eF
-eI
-eM
-eU
+io
+My
+rm
eG
-eY
-eJ
-eJ
+FA
+qO
+qO
eF
fh
eF
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -12248,8 +12254,8 @@ bV
gQ
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bL
@@ -12451,8 +12457,8 @@ bV
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -12469,23 +12475,23 @@ dX
ei
er
ej
-ev
+Yn
eG
-eJ
-eN
-eJ
+qO
+qB
+qO
eF
-eZ
-eJ
-eJ
+Vl
+qO
+qO
fi
fm
fi
-cx
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
+yf
bV
bV
bV
@@ -12500,13 +12506,13 @@ bV
bV
bV
bV
-cx
-cx
-cx
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
+yf
+yf
+yf
bV
bL
bL
@@ -12707,9 +12713,9 @@ bV
bV
bV
bV
-cx
-cx
-cx
+yf
+yf
+yf
bV
bV
bV
@@ -12725,44 +12731,44 @@ bL
dX
ej
ej
-ev
-ev
+Yn
+Yn
eG
-eJ
-eO
-eJ
+qO
+oD
+qO
eF
-fa
-eJ
-eJ
+wO
+qO
+qO
eF
fh
eF
bV
bV
bV
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
bV
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
bV
bV
bV
@@ -12964,8 +12970,8 @@ bV
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -12982,39 +12988,39 @@ bL
dW
ek
es
-ew
-eC
+QW
+Bj
eF
-eJ
-eJ
-eJ
-eJ
-eJ
-eJ
-eN
+qO
+qO
+qO
+qO
+qO
+qO
+qB
fh
bV
bV
bV
bV
bV
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
+yf
bV
fg
fg
@@ -13221,8 +13227,8 @@ bV
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -13242,28 +13248,28 @@ dX
dX
dW
eF
-eK
-eP
-eV
+PF
+CL
+zH
eF
-eJ
-eJ
-eJ
+qO
+qO
+qO
fh
bV
bV
bV
ff
bV
-cx
-cx
+yf
+yf
bV
ff
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -13477,9 +13483,9 @@ bZ
bV
bV
bV
-cx
-cx
-cx
+yf
+yf
+yf
bV
bV
bV
@@ -13512,15 +13518,15 @@ bV
bV
dW
fP
-cx
-cx
+yf
+yf
fJ
dW
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bL
bL
@@ -13734,8 +13740,8 @@ bV
bV
cj
bV
-cx
-cx
+yf
+yf
bV
bV
bZ
@@ -13768,16 +13774,16 @@ bV
cj
bV
fJ
-SX
-SX
-SX
-SX
+ws
+ws
+ws
+ws
fJ
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bL
bL
@@ -13991,8 +13997,8 @@ bV
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -14025,17 +14031,17 @@ bV
bV
bV
fJ
-SX
-SX
-SX
-SX
+ws
+ws
+ws
+ws
fJ
bV
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bL
@@ -14248,8 +14254,8 @@ bV
bV
bV
bV
-cx
-cx
+yf
+yf
bV
bV
bV
@@ -14282,19 +14288,19 @@ bV
bV
bV
fJ
-SX
-Eb
-SX
-SX
+ws
+GC
+ws
+ws
fJ
bV
bV
bV
bV
-cx
-cx
-cx
-cx
+yf
+yf
+yf
+yf
bV
bL
bL
@@ -14505,7 +14511,7 @@ bL
bV
bV
bV
-cx
+yf
bV
bV
bV
@@ -14539,10 +14545,10 @@ cj
bV
bV
fJ
-SX
-SX
-SX
-SX
+ws
+ws
+ws
+ws
fJ
bV
bV
@@ -14550,8 +14556,8 @@ bV
bL
dW
ge
-cx
-cx
+yf
+yf
bV
bL
bL
@@ -14808,8 +14814,8 @@ bL
bL
bV
bV
-cx
-cx
+yf
+yf
bV
bL
bL
@@ -15065,8 +15071,8 @@ bL
bL
bL
bV
-cx
-cx
+yf
+yf
bV
bL
bL
@@ -15322,8 +15328,8 @@ bL
bL
bL
bV
-cx
-cx
+yf
+yf
bV
bL
bL
@@ -15579,8 +15585,8 @@ dW
dX
dW
dW
-cx
-cx
+yf
+yf
bV
bL
bL
@@ -15827,17 +15833,17 @@ bL
bL
bL
dX
-fY
-gb
+il
+JM
dX
-gl
-ev
-ev
+Ca
+Yn
+Yn
fN
ej
gz
-cx
-cx
+yf
+yf
bV
bL
bL
@@ -16085,16 +16091,16 @@ bM
bM
fW
fy
-ev
-gf
-gm
-ev
-ev
+Yn
+Sn
+Id
+Yn
+Yn
fN
ej
gz
-cx
-cx
+yf
+yf
bV
bL
bL
@@ -16345,13 +16351,13 @@ fy
gc
gg
fy
-ev
-gm
+Yn
+Id
dW
dX
dW
-gA
-cx
+Em
+yf
bV
bV
bM
@@ -16603,13 +16609,13 @@ fy
gh
bM
go
-gq
-gw
+yD
+xF
fH
bV
bV
-cx
-cx
+yf
+yf
bV
bM
bM
@@ -16860,13 +16866,13 @@ bM
bM
bM
gp
-gt
-gx
+lI
+ti
fH
bV
bV
-cx
-cx
+yf
+yf
bM
bM
bM
@@ -17117,15 +17123,15 @@ fy
gi
fy
fy
-gq
-gy
+yD
+Tc
fH
cj
bV
bV
-cx
-cx
-cx
+yf
+yf
+yf
bM
bM
bM
@@ -17373,9 +17379,9 @@ bM
fy
dW
fy
-gq
-gu
-gq
+yD
+yo
+yD
dX
bL
bL
@@ -17628,11 +17634,11 @@ bM
bM
bM
fy
-gj
-ev
-gr
-gv
-gt
+kI
+Yn
+XG
+sm
+lI
dW
bL
bL
@@ -17886,10 +17892,10 @@ bM
bM
fy
fW
-ev
-gq
-gm
-gq
+Yn
+yD
+Id
+yD
dW
bL
bL
@@ -18408,7 +18414,7 @@ bL
bV
bV
fy
-gF
+BW
gH
ej
ej
@@ -18666,7 +18672,7 @@ bV
bV
bV
fy
-gI
+Uu
fy
gD
eu
@@ -19177,10 +19183,10 @@ bL
bL
bV
fW
-gB
+qG
fy
-gB
-gJ
+qG
+ZF
fy
fy
bM
@@ -19434,11 +19440,11 @@ bL
bL
bL
dX
-KD
-gE
-gG
-gJ
-gB
+vr
+kP
+VV
+ZF
+qG
fy
bM
bV
@@ -19694,10 +19700,10 @@ dW
dW
dW
dX
-gJ
-gM
-gJ
-gO
+ZF
+RM
+ZF
+pp
dX
gK
dW
@@ -53566,7 +53572,7 @@ bK
bJ
bR
bJ
-cf
+TC
ck
bR
bJ
@@ -53823,8 +53829,8 @@ bK
bJ
bW
bJ
-cf
-cf
+TC
+TC
bW
bJ
bJ
@@ -54080,11 +54086,11 @@ bK
bJ
bJ
bJ
-cf
-cf
-cf
-cf
-cf
+TC
+TC
+TC
+TC
+TC
bJ
bK
bK
@@ -54121,7 +54127,7 @@ bJ
bJ
bJ
bJ
-cQ
+NZ
gk
bJ
gs
@@ -54336,13 +54342,13 @@ bK
bK
bK
bX
-cb
-cf
-cf
-cf
-cf
-cf
-cf
+PD
+TC
+TC
+TC
+TC
+TC
+TC
bK
bK
bJ
@@ -54598,8 +54604,8 @@ bJ
bJ
bJ
bJ
-cf
-cf
+TC
+TC
bK
bK
bJ
@@ -57433,8 +57439,8 @@ bJ
dh
dm
dh
-do
-dv
+zI
+KG
bR
bK
bK
@@ -57690,8 +57696,8 @@ bQ
bR
dl
bR
-dr
-do
+yt
+zI
bR
bK
bK
@@ -57944,11 +57950,11 @@ bJ
bJ
cc
bR
-di
-dn
-do
-do
-dr
+zf
+oK
+zI
+zI
+yt
bQ
bK
bK
@@ -58201,11 +58207,11 @@ bJ
bJ
cc
bQ
-dj
-do
-do
-do
-do
+UE
+zI
+zI
+zI
+zI
bR
bK
bK
@@ -58458,11 +58464,11 @@ cd
bJ
cm
bQ
-dk
-dp
-dq
-ds
-dw
+Vq
+mV
+xx
+qo
+RG
bR
bK
bK
@@ -60767,7 +60773,7 @@ bK
bK
bR
bJ
-cQ
+NZ
bJ
bJ
bR
@@ -61572,7 +61578,7 @@ bK
bK
bK
bK
-fX
+Eq
bJ
bJ
bJ
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 1478721cd627f..bebe1933939a6 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -211,23 +211,24 @@
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)
- var/message_verb = "attacked"
- if(I.attack_verb && I.attack_verb.len)
- message_verb = "[pick(I.attack_verb)]"
- else if(!I.force)
+ if(!I.force && !length(I.attack_verb_simple) && !length(I.attack_verb_continuous))
return
+ var/message_verb_continuous = length(I.attack_verb_continuous) ? "[pick(I.attack_verb_continuous)]" : "attacks"
+ var/message_verb_simple = length(I.attack_verb_simple) ? "[pick(I.attack_verb_simple)]" : "attack"
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]!"
- var/attack_message_local = "You're [message_verb][message_hit_area] with [I]!"
+ var/attack_message_spectator = "[src] [message_verb_continuous][message_hit_area] with [I]!"
+ var/attack_message_victim = "You're [message_verb_continuous][message_hit_area] with [I]!"
+ var/attack_message_attacker = "You [message_verb_simple] [src][message_hit_area] with [I]!"
if(user in viewers(src))
- attack_message = "[user] [message_verb] [src][message_hit_area] with [I]!"
- attack_message_local = "[user] [message_verb] you[message_hit_area] with [I]!"
+ attack_message_spectator = "[user] [message_verb_continuous] [src][message_hit_area] with [I]!"
+ attack_message_victim = "[user] [message_verb_continuous] 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_local]", null, COMBAT_MESSAGE_RANGE)
+ attack_message_victim = "You [message_verb_simple] yourself[message_hit_area] with [I]"
+ visible_message("[attack_message_spectator]",\
+ "[attack_message_victim]", null, COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, "[attack_message_attacker]")
return 1
/mob/living/proc/send_item_poke_message(obj/item/I, mob/living/user)
diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm
index 88d97e35a99b9..cafc903ce2b41 100644
--- a/code/datums/martial/_martial.dm
+++ b/code/datums/martial/_martial.dm
@@ -57,7 +57,8 @@
if(!damage)
playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1)
D.visible_message("[A]'s [atk_verb] misses [D]!", \
- "[A]'s [atk_verb] misses you!", null, COMBAT_MESSAGE_RANGE)
+ "You avoid [A]'s [atk_verb]!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "Your [atk_verb] misses [D]!")
log_combat(A, D, "attempted to [atk_verb]", important = FALSE)
return 0
@@ -66,7 +67,8 @@
playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1)
D.visible_message("[A] [atk_verb]ed [D]!", \
- "[A] [atk_verb]ed you!", null, COMBAT_MESSAGE_RANGE)
+ "You're [atk_verb]ed by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You [atk_verb]ed [D]!")
D.apply_damage(damage, A.dna.species.attack_type, affecting, armor_block)
diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm
index 4f25d63587843..e4574d029988f 100644
--- a/code/datums/martial/boxing.dm
+++ b/code/datums/martial/boxing.dm
@@ -39,7 +39,8 @@
var/knockout_prob = D.getStaminaLoss() + rand(-15,15)
if((D.stat != DEAD) && prob(knockout_prob))
D.visible_message("[A] knocks [D] out with a haymaker!", \
- "[A] knocks you out with a haymaker!")
+ "You're knocked unconscious by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You knock [D] out with a haymaker!")
D.apply_effect(200,EFFECT_KNOCKDOWN,armor_block)
D.SetSleeping(100)
D.force_say(A)
diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm
index 065a874e6de87..cc0a52c57e49d 100644
--- a/code/datums/martial/cqc.dm
+++ b/code/datums/martial/cqc.dm
@@ -54,8 +54,9 @@
if(!can_use(A))
return FALSE
if(D.body_position == STANDING_UP)
- D.visible_message("[A] slams [D] into the ground!", \
- "[A] slams you into the ground!")
+ D.visible_message("[A] slams [D] into the ground!", \
+ "You're slammed into the ground by [A]!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You slam [D] into the ground!")
playsound(get_turf(A), 'sound/weapons/slam.ogg', 50, 1, -1)
D.apply_damage(10, BRUTE, blocked = def_check)
D.Paralyze(120)
@@ -67,8 +68,9 @@
if(!can_use(A))
return FALSE
if(!D.stat || !D.IsParalyzed())
- D.visible_message("[A] kicks [D] back!", \
- "[A] kicks you back!", null, COMBAT_MESSAGE_RANGE)
+ D.visible_message("[A] kicks [D] back!", \
+ "You're kicked back by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You kick [D] back!")
playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, 1, -1)
var/atom/throw_target = get_edge_target_turf(D, A.dir)
D.throw_at(throw_target, 1, 14, A)
@@ -76,8 +78,9 @@
log_combat(A, D, "kicked (CQC)", name)
if(D.IsParalyzed() && !D.stat)
log_combat(A, D, "knocked out (Head kick)(CQC)", name)
- D.visible_message("[A] kicks [D]'s head, knocking [D.p_them()] out!", \
- "[A] kicks your head, knocking you out!")
+ D.visible_message("[A] kicks [D]'s head, knocking [D.p_them()] out!", \
+ "You're knocked unconscious by [A]!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You kick [D]'s head, knocking [D.p_them()] out!")
playsound(get_turf(A), 'sound/weapons/genhit1.ogg', 50, 1, -1)
D.SetSleeping(300)
D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
@@ -88,7 +91,8 @@
return FALSE
log_combat(A, D, "pressured (CQC)", name)
D.visible_message("[A] punches [D]'s neck!", \
- "[A] punches your neck!", null, COMBAT_MESSAGE_RANGE)
+ "Your neck is punched by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You punch [D]'s neck!")
D.adjustStaminaLoss(60)
playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, 1, -1)
return TRUE
@@ -101,7 +105,8 @@
if(!D.stat)
log_combat(A, D, "restrained (CQC)", name)
D.visible_message("[A] locks [D] into a restraining position!", \
- "[A] locks you into a restraining position!")
+ "You're locked into a restraining position by [A]!", "You hear shuffling and a muffled groan!", null, A)
+ to_chat(A, "You lock [D] into a restraining position!")
D.adjustStaminaLoss(20)
D.Stun(100)
restraining = TRUE
@@ -114,8 +119,9 @@
return FALSE
if(!D.stat)
log_combat(A, D, "consecutive CQC'd (CQC)", name)
- D.visible_message("[A] strikes [D]'s abdomen, neck and back consecutively.", \
- "[A] strikes your abdomen, neck and back consecutively!", null, COMBAT_MESSAGE_RANGE)
+ D.visible_message("[A] strikes [D]'s abdomen, neck and back consecutively", \
+ "Your abdomen, neck and back are struck consecutively by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You strike [D]'s abdomen, neck and back consecutively!")
playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, 1, -1)
var/obj/item/I = D.get_active_held_item()
if(I && D.temporarilyRemoveItemFromInventory(I))
@@ -139,7 +145,8 @@
A.setGrabState(GRAB_AGGRESSIVE) //Instant aggressive grab if on grab intent
log_combat(A, D, "grabbed", name, addition="aggressively")
D.visible_message("[A] violently grabs [D]!", \
- "[A] violently grabs you!")
+ "You're grabbed violently by [A]!", "You hear sounds of aggressive fondling!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You violently grab [D]!")
else
D.grabbedby(A, 1)
return TRUE
@@ -153,22 +160,25 @@
return TRUE
log_combat(A, D, "attacked (CQC)", name)
A.do_attack_animation(D)
- var/picked_hit_type = pick("CQC'd", "Big Bossed")
+ var/picked_hit_type = pick("CQC", "Big Boss")
var/bonus_damage = 13
if(D.body_position == LYING_DOWN)
bonus_damage += 5
- picked_hit_type = "stomps on"
+ picked_hit_type = "stomp"
D.apply_damage(bonus_damage, BRUTE, blocked = def_check)
- if(picked_hit_type == "kicks" || picked_hit_type == "stomps on")
+ if(picked_hit_type == "kick" || picked_hit_type == "stomp")
playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, 1, -1)
else
playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, 1, -1)
- D.visible_message("[A] [picked_hit_type] [D]!", \
- "[A] [picked_hit_type] you!", null, COMBAT_MESSAGE_RANGE)
+ D.visible_message("[A] [picked_hit_type]ed [D]!", \
+ "You're [picked_hit_type]ed by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You [picked_hit_type] [D]!")
+ log_combat(A, D, "[picked_hit_type]s (CQC)")
log_combat(A, D, "[picked_hit_type] (CQC)", name)
if(A.resting && !D.stat && !D.IsParalyzed())
- D.visible_message("[A] leg sweeps [D]!", \
- "[A] leg sweeps you!")
+ D.visible_message("[A] leg sweeps [D]!", \
+ "Your legs are sweeped by [A]!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You leg sweep [D]!")
playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1)
D.apply_damage(10, BRUTE, blocked = def_check)
D.Paralyze(60)
@@ -186,8 +196,9 @@
if(prob(65))
if(!D.stat || !D.IsParalyzed() || !restraining)
I = D.get_active_held_item()
- D.visible_message("[A] strikes [D]'s jaw with their hand!", \
- "[A] strikes your jaw, disorienting you!", null, COMBAT_MESSAGE_RANGE)
+ D.visible_message("[A] strikes [D]'s jaw with their hand!", \
+ "Your jaw is struck by [A], you feel disoriented!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You strike [D]'s jaw, leaving [D.p_them()] disoriented!")
playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, 1, -1)
if(I && D.temporarilyRemoveItemFromInventory(I))
A.put_in_hands(I)
@@ -195,13 +206,15 @@
D.apply_damage(5, A.dna.species.attack_type, blocked = def_check)
else
D.visible_message("[A] fails to disarm [D]!", \
- "[A] fails to disarm you!", null, COMBAT_MESSAGE_RANGE)
+ "You're nearly disarmed by [A]!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You fail to disarm [D]!")
playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
log_combat(A, D, "disarmed (CQC)[I ? " grabbing \the [I]" : ""]", name)
if(restraining && A.pulling == D)
log_combat(A, D, "knocked out (Chokehold)(CQC)", name)
D.visible_message("[A] puts [D] into a chokehold!", \
- "[A] puts you into a chokehold!")
+ "You're put into a chokehold by [A]!", "You hear shuffling and a muffled groan!", null, A)
+ to_chat(A, "You put [D] into a chokehold!")
D.SetSleeping(400)
restraining = FALSE
if(A.grab_state < GRAB_NECK)
diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm
index 9bc879c7a815e..32600b825d236 100644
--- a/code/datums/martial/krav_maga.dm
+++ b/code/datums/martial/krav_maga.dm
@@ -102,7 +102,8 @@
/datum/martial_art/krav_maga/proc/quick_choke(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch
D.visible_message("[A] pounds [D] on the chest!", \
- "[A] slams your chest! You can't breathe!", null, COMBAT_MESSAGE_RANGE)
+ "Your chest is slammed by [A]! You can't breathe!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You pound [D] on the chest!")
playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1)
if(D.losebreath <= 10)
D.losebreath = clamp(D.losebreath + 5, 0, 10)
@@ -112,7 +113,8 @@
/datum/martial_art/krav_maga/proc/neck_chop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
D.visible_message("[A] karate chops [D]'s neck!", \
- "[A] karate chops your neck, rendering you unable to speak!", null, COMBAT_MESSAGE_RANGE)
+ "Your neck is karate chopped by [A], rendering you unable to speak!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You karate chop [D]'s neck, rendering [D.p_them()] unable to speak!")
playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1)
D.apply_damage(5, A.dna.species.attack_type)
if(D.silent <= 10)
@@ -131,20 +133,21 @@
return 1
var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.get_combat_bodyzone(D)))
var/armor_block = D.run_armor_check(affecting, MELEE)
- var/picked_hit_type = pick("punched", "kicked")
+ var/picked_hit_type = pick("punch", "kick")
var/bonus_damage = 0
if(D.body_position == LYING_DOWN)
bonus_damage += 5
- picked_hit_type = "stomped"
+ picked_hit_type = "stomp"
D.apply_damage(rand(5,10) + bonus_damage, A.dna.species.attack_type, affecting, armor_block)
- if(picked_hit_type == "kicked" || picked_hit_type == "stomped")
+ if(picked_hit_type == "kick" || picked_hit_type == "stomp")
A.do_attack_animation(D, ATTACK_EFFECT_KICK)
playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, 1, -1)
else
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, 1, -1)
- D.visible_message("[A] [picked_hit_type] [D]!", \
- "[A] [picked_hit_type] you!", null, COMBAT_MESSAGE_RANGE)
+ D.visible_message("[A] [picked_hit_type]s [D]!", \
+ "You're [picked_hit_type]ed by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You [picked_hit_type] [D]!")
log_combat(A, D, "[picked_hit_type] with [name]", name)
return 1
diff --git a/code/datums/martial/mushpunch.dm b/code/datums/martial/mushpunch.dm
index f7bac312bab95..a96abeb4d4ffd 100644
--- a/code/datums/martial/mushpunch.dm
+++ b/code/datums/martial/mushpunch.dm
@@ -9,9 +9,10 @@
to_chat(A, "Your attack was interrupted!")
return TRUE //martial art code was a mistake
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- atk_verb = pick("punches", "smashes", "ruptures", "cracks")
- D.visible_message("[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!", \
- "[A] [atk_verb] you with inhuman strength, sending you flying backwards!")
+ atk_verb = pick("punch", "smash", "crack")
+ D.visible_message("[A] [atk_verb]ed [D] with such inhuman strength that it sends [D.p_them()] flying backwards!", \
+ "You're [atk_verb]ed by [A] with such inhuman strength that it sends you flying backwards!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You [atk_verb] [D] with such inhuman strength that it sends [D.p_them()] flying backwards!")
D.apply_damage(rand(15,30), A.dna.species.attack_type)
playsound(D, 'sound/effects/meteorimpact.ogg', 25, 1, -1)
var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm
index e11e6ff730a83..095751cfe2f50 100644
--- a/code/datums/martial/plasma_fist.dm
+++ b/code/datums/martial/plasma_fist.dm
@@ -42,7 +42,8 @@
/datum/martial_art/plasma_fist/proc/Throwback(mob/living/carbon/human/A, mob/living/carbon/human/D)
D.visible_message("[A] hits [D] with Plasma Punch!", \
- "[A] hits you with Plasma Punch!")
+ "You're hit with a Plasma Punch by [A]!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You hit [D] with Plasma Punch!")
playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A)))
D.throw_at(throw_target, 200, 4,A)
@@ -55,7 +56,8 @@
playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
A.say("PLASMA FIST!", forced="plasma fist")
D.visible_message("[A] hits [D] with THE PLASMA FIST TECHNIQUE!", \
- "[A] hits you with THE PLASMA FIST TECHNIQUE!")
+ "You're suddenly hit with THE PLASMA FIST TECHNIQUE by [A]!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You hit [D] with THE PLASMA FIST TECHNIQUE!")
D.gib()
log_combat(A, D, "gibbed (Plasma Fist)", name)
return
diff --git a/code/datums/martial/psychotic_brawl.dm b/code/datums/martial/psychotic_brawl.dm
index b8a0cccb5126c..9ec3de8cadd20 100644
--- a/code/datums/martial/psychotic_brawl.dm
+++ b/code/datums/martial/psychotic_brawl.dm
@@ -44,9 +44,10 @@
A.setGrabState(GRAB_PASSIVE)
if(4)
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- atk_verb = "headbutts"
- D.visible_message("[A] [atk_verb] [D]!", \
- "[A] [atk_verb] you!")
+ atk_verb = "headbutt"
+ D.visible_message("[A] [atk_verb]s [D]!", \
+ "You're [atk_verb]ed by [A]!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You [atk_verb] [D]!")
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 40, 1, -1)
D.apply_damage(rand(5,10), A.dna.species.attack_type, BODY_ZONE_HEAD)
A.apply_damage(rand(5,10), A.dna.species.attack_type, BODY_ZONE_HEAD)
@@ -56,9 +57,10 @@
D.Stun(rand(5,30))
if(5,6)
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- atk_verb = pick("punches", "kicks", "hits", "slams into")
- D.visible_message("[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!", \
- "[A] [atk_verb] you with inhuman strength, sending you flying backwards!")
+ atk_verb = pick("kick", "hit", "slam")
+ D.visible_message("[A] [atk_verb]s [D] with such inhuman strength that it sends [D.p_them()] flying backwards!", \
+ "You're [atk_verb]ed by [A] with such inhuman strength that it sends you flying backwards!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You [atk_verb] [D] with such inhuman strength that it sends [D.p_them()] flying backwards!")
D.apply_damage(rand(15,30), A.dna.species.attack_type)
playsound(get_turf(D), 'sound/effects/meteorimpact.ogg', 25, 1, -1)
var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index dd2f0a6718b1e..789734e3213d9 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -41,8 +41,9 @@
if(!D.stat && !D.IsStun() && !D.IsParalyzed())
log_combat(A, D, "wrist wrenched (Sleeping Carp)", name)
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- D.visible_message("[A] grabs [D]'s wrist and wrenches it sideways!", \
- "[A] grabs your wrist and violently wrenches it to the side!")
+ D.visible_message("[A] grabs [D]'s wrist and wrenches it sideways!", \
+ "Your wrist is grabbed by [A] while simultaneously wrenched it to the side!", "You hear aggressive shuffling!", null, A)
+ to_chat(A, "You grab [D]'s wrist and wrench it sideways!")
playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
D.emote("scream")
D.dropItemToGround(D.get_active_held_item())
@@ -58,7 +59,8 @@
log_combat(A, D, "back-kicked (Sleeping Carp)", name)
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
D.visible_message("[A] kicks [D] in the back!", \
- "[A] kicks you in the back, making you stumble and fall!")
+ "You're kicked in the back by [A]!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You kick [D] in the back!")
step_to(D,get_step(D,D.dir),1)
D.Paralyze(80)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
@@ -66,15 +68,17 @@
else
log_combat(A, D, "missed a back-kick (Sleeping Carp) on", name)
D.visible_message("[A] tries to kick [D] in the back, but misses!", \
- "[A] tries to kick you in the back, but misses!")
+ "You avoid a kick in the back by [A]!", "You hear a swoosh!", null, A)
+ to_chat(A, "Your kick to [D]'s back misses!")
return basic_hit(A,D)
/datum/martial_art/the_sleeping_carp/proc/kneeStomach(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!D.stat && !D.IsParalyzed())
log_combat(A, D, "stomach kneed (Sleeping Carp)", name)
A.do_attack_animation(D, ATTACK_EFFECT_KICK)
- D.visible_message("[A] knees [D] in the stomach!", \
- "[A] winds you with a knee in the stomach!")
+ D.visible_message("[A] knees [D] in the stomach!", \
+ "Your stomach is kneed by [A], making you gag!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You knee [D] in the stomach, [D.p_them()] them gag!")
D.audible_message("[D] gags!")
D.losebreath += 3
D.Stun(40)
@@ -88,7 +92,8 @@
log_combat(A, D, "head kicked (Sleeping Carp)", name)
A.do_attack_animation(D, ATTACK_EFFECT_KICK)
D.visible_message("[A] kicks [D] in the head!", \
- "[A] kicks you in the jaw!")
+ "Your jaw is kicked by [A]!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You kick [D] in the jaw!")
D.apply_damage(20, A.dna.species.attack_type, BODY_ZONE_HEAD, blocked = def_check)
D.drop_all_held_items()
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
@@ -101,8 +106,9 @@
if(D.body_position == LYING_DOWN)
log_combat(A, D, "elbow dropped (Sleeping Carp)", name)
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- D.visible_message("[A] elbow drops [D]!", \
- "[A] piledrives you with their elbow!")
+ D.visible_message("[A] elbow drops [D]!", \
+ "You're piledrived by [A] with [A.p_their()] elbow!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You piledrive [D] with your elbow!")
if(D.stat)
D.death() //FINISH HIM!
D.apply_damage(50, A.dna.species.attack_type, BODY_ZONE_CHEST, blocked = def_check)
@@ -123,7 +129,8 @@
A.setGrabState(GRAB_AGGRESSIVE) //Instant aggressive grab if on grab intent
log_combat(A, D, "grabbed", name, addition="aggressively")
D.visible_message("[A] violently grabs [D]!", \
- "[A] violently grabs you!")
+ "You're violently grabbed by [A]!", "You hear aggressive shuffling!", null, A)
+ to_chat(A, "You violently grab [D]!")
else
D.grabbedby(A, 1)
return 1
@@ -134,19 +141,20 @@
if(check_streak(A,D))
return 1
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams")
- D.visible_message("[A] [atk_verb] [D]!", \
- "[A] [atk_verb] you!")
+ var/atk_verb = pick("kick", "chop", "hit", "slam")
+ D.visible_message("[A] [atk_verb]s [D]!", \
+ "[A] [atk_verb]s you!", null, null, A)
+ to_chat(A, "You [atk_verb] [D]!")
D.apply_damage(15, BRUTE, blocked = def_check)
- playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, 1, -1)
+ playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
log_combat(A, D, "[atk_verb] (Sleeping Carp)", name)
- return 1
+ return TRUE
/datum/martial_art/the_sleeping_carp/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
add_to_streak("D",D)
if(check_streak(A,D))
- return 1
+ return TRUE
return ..()
/mob/living/carbon/human/proc/sleeping_carp_help()
@@ -170,7 +178,8 @@
slot_flags = ITEM_SLOT_BACK
throwforce = 20
throw_speed = 2
- attack_verb = list("smashed", "slammed", "whacked", "thwacked")
+ attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks")
+ attack_verb_simple = list("smash", "slam", "whack", "thwack")
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "bostaff0"
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
@@ -212,25 +221,22 @@
if(!ishuman(target))
return ..()
var/mob/living/carbon/human/H = target
- var/list/fluffmessages = list("[user] clubs [H] with [src]!", \
- "[user] smacks [H] with the butt of [src]!", \
- "[user] broadsides [H] with [src]!", \
- "[user] smashes [H]'s head with [src]!", \
- "[user] beats [H] with front of [src]!", \
- "[user] twirls and slams [H] with [src]!")
- H.visible_message("[pick(fluffmessages)]", \
- "[pick(fluffmessages)]")
+ var/list/fluffmessages = list("club", "smack", "broadside", "beat", "slam")
+ H.visible_message("[user] [pick(fluffmessages)]s [H] with [src]!", \
+ "[user] [pick(fluffmessages)]s you with [src]!", "You hear a sickening sound of flesh hitting flesh!", null, user)
+ to_chat(user, "You [pick(fluffmessages)] [H] with [src]!")
playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, 1, -1)
H.adjustStaminaLoss(rand(13,20))
if(prob(10))
H.visible_message("[H] collapses!", \
- "Your legs give out!")
+ "Your legs give out!")
H.Paralyze(80)
if(H.staminaloss && !H.IsSleeping())
var/total_health = (H.health - H.staminaloss)
if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat)
H.visible_message("[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!", \
- "[user] knocks you unconscious!")
+ "You're knocked unconscious by [user]!", "You hear a sickening sound of flesh hitting flesh!", null, user)
+ to_chat(user, "You deliver a heavy hit to [H]'s head, knocking [H.p_them()] out cold!")
H.SetSleeping(600)
H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
else
diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm
index 3150a62f5ee90..607618dfce0ae 100644
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -135,8 +135,9 @@
D.setDir(get_dir(D, A))
D.Stun(80)
- D.visible_message("[A] starts spinning around with [D]!", \
- "[A] starts spinning around with you!")
+ D.visible_message("[A] starts spinning around with [D]!", \
+ "You're spun around by [A]!", "You hear aggressive shuffling!", null, A)
+ to_chat(A, "You start spinning around with [D]!")
A.emote("scream")
for (var/i in 1 to 20)
@@ -188,8 +189,9 @@
D.forceMove(A.loc) // Maybe this will help with the wallthrowing bug.
- D.visible_message("[A] throws [D]!", \
- "[A] throws you!")
+ D.visible_message("[A] throws [D]!", \
+ "You're thrown by [A]!", "You hear aggressive shuffling and a loud thud!", null, A)
+ to_chat(A, "You throw [D]!")
playsound(A.loc, "swing_hit", 50, 1)
var/turf/T = get_edge_target_turf(A, A.dir)
if (T && isturf(T))
@@ -217,8 +219,9 @@
A.setDir(get_dir(A, D))
D.setDir(get_dir(D, A))
- D.visible_message("[A] lifts [D] up!", \
- "[A] lifts you up!")
+ D.visible_message("[A] lifts [D] up!", \
+ "You're lifted up by [A]!", "You hear aggressive shuffling!", null, A)
+ to_chat(A, "You lift [D] up!")
FlipAnimation()
@@ -288,8 +291,9 @@
if (3)
fluff = "atomic [fluff]"
- D.visible_message("[A] [fluff] [D]!", \
- "[A] [fluff] you!", null, COMBAT_MESSAGE_RANGE)
+ D.visible_message("[A] [fluff] [D]!", \
+ "You're [fluff]ed by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You [fluff] [D]!")
playsound(A.loc, "swing_hit", 50, 1)
if (!D.stat)
D.emote("scream")
@@ -332,8 +336,9 @@
A.forceMove(D.loc)
addtimer(CALLBACK(src, PROC_REF(CheckStrikeTurf), A, T), 4)
- D.visible_message("[A] headbutts [D]!", \
- "[A] headbutts you!", null, COMBAT_MESSAGE_RANGE)
+ D.visible_message("[A] headbutts [D]!", \
+ "You're headbutted by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You headbutt [D]!")
D.adjustBruteLoss(rand(10,20))
playsound(A.loc, "swing_hit", 50, 1)
D.Unconscious(20)
@@ -346,8 +351,9 @@
A.emote("flip")
A.setDir(turn(A.dir, 90))
- D.visible_message("[A] roundhouse-kicks [D]!", \
- "[A] roundhouse-kicks you!", null, COMBAT_MESSAGE_RANGE)
+ D.visible_message("[A] roundhouse-kicks [D]!", \
+ "You're roundhouse-kicked by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You roundhouse-kick [D]!")
playsound(A.loc, "swing_hit", 50, 1)
D.adjustBruteLoss(rand(10,20))
@@ -377,8 +383,8 @@
if (surface && (ST && isturf(ST)))
A.forceMove(ST)
- A.visible_message("[A] climbs onto [surface]!", \
- "You climb onto [surface]!")
+ A.visible_message("[A] climbs onto [surface]!", \
+ "You climb onto [surface]!")
A.pixel_y = A.base_pixel_y + 10
falling = 1
sleep(10)
@@ -389,7 +395,7 @@
if ((falling == 0 && get_dist(A, D) > 1) || (falling == 1 && get_dist(A, D) > 2)) // We climbed onto stuff.
A.pixel_y = A.base_pixel_y
if (falling == 1)
- A.visible_message("...and dives head-first into the ground, ouch!", \
+ A.visible_message("...and dives head-first into the ground, ouch!", \
"...and dive head-first into the ground, ouch!")
A.adjustBruteLoss(rand(10,20))
A.Paralyze(60)
@@ -409,8 +415,9 @@
A.forceMove(D.loc)
- D.visible_message("[A] leg-drops [D]!", \
- "[A] leg-drops you!")
+ D.visible_message("[A] leg-drops [D]!", \
+ "You're leg-dropped by [A]!", "You hear a sickening sound of flesh hitting flesh!", null, A)
+ to_chat(A, "You leg-drop [D]!")
playsound(A.loc, "swing_hit", 50, 1)
A.emote("scream")
@@ -445,7 +452,8 @@
return 1
A.start_pulling(D)
D.visible_message("[A] gets [D] in a cinch!", \
- "[A] gets you in a cinch!", null, COMBAT_MESSAGE_RANGE)
+ "You're put into a cinch by [A]!", "You hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, A)
+ to_chat(A, "You get [D] in a cinch!")
D.Stun(rand(60,100))
log_combat(A, D, "cinched", name)
return 1
diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm
index 8725d73db5e7a..a7eb976c49c1a 100644
--- a/code/game/gamemodes/clown_ops/clown_weapons.dm
+++ b/code/game/gamemodes/clown_ops/clown_weapons.dm
@@ -73,7 +73,7 @@
force_on = 0
throwforce_on = 0
hitsound = null
- attack_verb_on = list("slipped")
+ attack_verb_on = list("slips")
clumsy_check = FALSE
sharpness = IS_BLUNT
sword_color = "yellow"
diff --git a/code/game/machinery/newscaster/newspaper.dm b/code/game/machinery/newscaster/newspaper.dm
index 759aabbd55c2c..54a919f2bcdd5 100644
--- a/code/game/machinery/newscaster/newspaper.dm
+++ b/code/game/machinery/newscaster/newspaper.dm
@@ -10,7 +10,8 @@ I am begging someone to remake this to be more like the paper UI, it's so bad.
lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("bapped")
+ attack_verb_continuous = list("baps")
+ attack_verb_simple = list("bap")
resistance_flags = FLAMMABLE
var/screen = 0
var/pages = 0
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 5a21f635f38b8..396a55212e290 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -138,7 +138,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/breakouttime = 0
/// Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
- var/list/attack_verb
+ var/list/attack_verb_continuous
+ var/list/attack_verb_simple
/// list() of species types, if a species cannot put items in a certain slot, but species type is in list, it will be able to wear that item
var/list/species_exception = null
///A bitfield of a species to use as an alternative sprite for any given item. DMIs are stored in the species datum and called via proc in update_icons.
@@ -229,8 +230,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/obj/item/Initialize(mapload)
- if (attack_verb)
- attack_verb = typelist("attack_verb", attack_verb)
+ if(attack_verb_continuous)
+ attack_verb_continuous = typelist("attack_verb_continuous", attack_verb_continuous)
+ if(attack_verb_simple)
+ attack_verb_simple = typelist("attack_verb_simple", attack_verb_simple)
. = ..()
for(var/path in actions_types)
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index de93897096974..6877e537a9e3e 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -7,7 +7,8 @@
name = "area modification item"
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "blueprints"
- attack_verb = list("attacked", "bapped", "hit")
+ attack_verb_continuous = list("attacks", "baps", "hits")
+ attack_verb_simple = list("attack", "bap", "hit")
var/fluffnotice = "Nobody's gonna read this stuff!"
var/in_use = FALSE
diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm
index 3f37270288158..062e95cff6d8c 100644
--- a/code/game/objects/items/broom.dm
+++ b/code/game/objects/items/broom.dm
@@ -10,7 +10,8 @@
throw_speed = 3
throw_range = 7
w_class = WEIGHT_CLASS_LARGE
- attack_verb = list("swept", "brushed off", "bludgeoned", "whacked")
+ attack_verb_continuous = list("sweeps", "brushes off", "bludgeons", "whacks")
+ attack_verb_simple = list("sweep", "brush off", "bludgeon", "whack")
resistance_flags = FLAMMABLE
/obj/item/pushbroom/Initialize(mapload)
diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm
index 5d84cdcfcccb6..cc09f01d685c7 100644
--- a/code/game/objects/items/chainsaw.dm
+++ b/code/game/objects/items/chainsaw.dm
@@ -17,7 +17,8 @@
throw_speed = 2
throw_range = 4
custom_materials = list(/datum/material/iron=13000)
- attack_verb = list("sawed", "tore", "cut", "chopped", "diced")
+ attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices")
+ attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice")
hitsound = "swing_hit"
sharpness = IS_SHARP
bleed_force = BLEED_DEEP_WOUND
@@ -89,7 +90,8 @@
righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
force_on = 40
w_class = WEIGHT_CLASS_HUGE
- attack_verb = list("sawed", "shred", "rended", "gutted", "eviscerated")
+ attack_verb_continuous = list("saws", "shreds", "rends", "guts", "eviscerates")
+ attack_verb_simple = list("saw", "shred", "rend", "gut", "eviscerate")
actions_types = list(/datum/action/item_action/startchainsaw)
block_power = 50
armour_penetration = 50
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index f536623565e43..bd1597fe5942e 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -50,7 +50,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = "cigon"
name = "lit [initial(name)]"
desc = "A [initial(name)]. This one is lit."
- attack_verb = list("burnt","singed")
+ attack_verb_continuous = list("burns", "sings")
+ attack_verb_simple = list("burn", "sing")
START_PROCESSING(SSobj, src)
update_icon()
@@ -64,7 +65,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = "cigoff"
name = "burnt [initial(name)]"
desc = "A [initial(name)]. This one has seen better days."
- attack_verb = list("flicked")
+ attack_verb_continuous = list("flicks")
+ attack_verb_simple = list("flick")
STOP_PROCESSING(SSobj, src)
/obj/item/match/extinguish()
@@ -232,7 +234,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = TRUE
name = "lit [name]"
- attack_verb = list("burnt", "singed")
+ attack_verb_continuous = list("burns", "sings")
+ attack_verb_simple = list("burn", "sing")
hitsound = 'sound/items/welder.ogg'
damtype = BURN
force = 4
@@ -266,7 +269,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(!lit)
return
name = copytext_char(name, 5) //5 == length_char("lit ") + 1
- attack_verb = null
+ attack_verb_continuous = null
+ attack_verb_simple = null
hitsound = null
damtype = BRUTE
force = 0
@@ -685,12 +689,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM
force = 5
damtype = BURN
hitsound = 'sound/items/welder.ogg'
- attack_verb = list("burnt", "singed")
+ attack_verb_continuous = list("burns", "sings")
+ attack_verb_simple = list("burn", "sing")
START_PROCESSING(SSobj, src)
else
hitsound = "swing_hit"
force = 0
- attack_verb = null //human_defense.dm takes care of it
+ attack_verb_continuous = null //human_defense.dm takes care of it
+ attack_verb_simple = null
STOP_PROCESSING(SSobj, src)
set_light_on(lit)
update_icon()
diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm
index 3239064b6bff8..fccd2d2a0d98f 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -150,7 +150,8 @@
item_flags = ISWEAPON
throw_speed = 3
throw_range = 7
- attack_verb = list("HONKED")
+ attack_verb_continuous = list("HONKS")
+ attack_verb_simple = list("HONK")
tool_behaviour = TOOL_BIKEHORN
toolspeed = 1
///sound file given to the squeaky component we make in Initialize() so sub-types can specify their own sound
diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm
index d53776dd14bd3..fbdf6d1d87cee 100644
--- a/code/game/objects/items/cosmetics.dm
+++ b/code/game/objects/items/cosmetics.dm
@@ -255,7 +255,8 @@
throw_speed = 3
throw_range = 6
hitsound = 'sound/weapons/genhit.ogg'
- attack_verb = list("stubbed", "poked")
+ attack_verb_continuous = list("stubs", "pokes")
+ attack_verb_simple = list("stub", "poke")
extended = 0
var/extended_force = 10
var/extended_throwforce = 7
@@ -273,7 +274,8 @@
w_class = WEIGHT_CLASS_SMALL //if it becomes normal you can decapitate a guy with a straight razor
throwforce = extended_throwforce
icon_state = extended_icon_state
- attack_verb = list("slashed", "stabbed", "sliced", "slit", "shaved", "diced", "cut")
+ attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_SURFACE
@@ -283,7 +285,8 @@
w_class = WEIGHT_CLASS_TINY
throwforce = initial(throwforce)
icon_state = initial(icon_state)
- attack_verb = list("stubbed", "poked")
+ attack_verb_continuous = list("stubs", "pokes")
+ attack_verb_simple = list("stub", "poke")
hitsound = 'sound/weapons/genhit.ogg'
sharpness = IS_BLUNT
bleed_force = 0
diff --git a/code/game/objects/items/courtroom.dm b/code/game/objects/items/courtroom.dm
index 516360f38ae8b..2f77ae200947f 100644
--- a/code/game/objects/items/courtroom.dm
+++ b/code/game/objects/items/courtroom.dm
@@ -10,7 +10,8 @@
force = 5
throwforce = 6
w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("bashed", "battered", "judged", "whacked")
+ attack_verb_continuous = list("bashes", "batters", "judges", "whacks")
+ attack_verb_simple = list("bash", "batter", "judge", "whack")
resistance_flags = FLAMMABLE
/obj/item/gavelhammer/suicide_act(mob/living/user)
diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm
index 5b4b0946fea3e..86c70df846b98 100644
--- a/code/game/objects/items/crab17.dm
+++ b/code/game/objects/items/crab17.dm
@@ -4,7 +4,8 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "suspiciousphone"
w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("dumped")
+ attack_verb_continuous = list("dumps")
+ attack_verb_simple = list("dump")
var/activated = FALSE
/obj/item/suspiciousphone/attack_self(mob/user)
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 0d1ac193176ce..3a283f3b30cd0 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -28,7 +28,8 @@
var/crayon_color = "red"
w_class = WEIGHT_CLASS_TINY
- attack_verb = list("attacked", "coloured")
+ attack_verb_continuous = list("attacks", "colours")
+ attack_verb_simple = list("attack", "colour")
grind_results = list()
var/paint_color = "#FF0000" //RGB
diff --git a/code/game/objects/items/devices/doorCharge.dm b/code/game/objects/items/devices/doorCharge.dm
index d2caaa1fad25e..9eab0fc7db171 100644
--- a/code/game/objects/items/devices/doorCharge.dm
+++ b/code/game/objects/items/devices/doorCharge.dm
@@ -11,7 +11,8 @@
throw_speed = 1
item_flags = NOBLUDGEON
force = 3
- attack_verb = list("blown up", "exploded", "detonated")
+ attack_verb_continuous = list("explodes", "detonates")
+ attack_verb_simple = list("explode", "detonate")
custom_materials = list(/datum/material/iron=50, /datum/material/glass=30)
/obj/item/doorCharge/ex_act(severity, target)
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 3f9c1d818ea81..9b98b13ad763e 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -194,7 +194,8 @@ effective or pretty fucking useless.
item_state = "utility"
worn_icon_state = "utility"
slot_flags = ITEM_SLOT_BELT
- attack_verb = list("whipped", "lashed", "disciplined")
+ attack_verb_continuous = list("whips", "lashes", "disciplines")
+ attack_verb_simple = list("whip", "lash", "discipline")
var/mob/living/carbon/human/user = null
var/charge = 300
@@ -261,7 +262,8 @@ effective or pretty fucking useless.
worn_icon_state = "sheetblack"
slot_flags = ITEM_SLOT_NECK
layer = MOB_LAYER
- attack_verb = null
+ attack_verb_continuous = null
+ attack_verb_simple = null
/obj/item/shadowcloak/magician/attackby(obj/item/W, mob/user, params)
. = ..()
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
index 6b575424b02c8..758e005962151 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -19,7 +19,8 @@
item_flags = ISWEAPON
var/saber_color = "green"
light_color = "#00ff00"//green
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
block_level = 2
block_upgrade_walk = 1
block_power = 70
diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm
index 0352093079ad4..d25de6a13e892 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -12,7 +12,8 @@
throw_range = 7
force = 10
custom_materials = list(/datum/material/iron = 90)
- attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
+ attack_verb_continuous = list("slams", "whacks", "bashes", "thunks", "batters", "bludgeons", "thrashes")
+ attack_verb_simple = list("slam", "whack", "bash", "thunk", "batter", "bludgeon", "thrash")
dog_fashion = /datum/dog_fashion/back
resistance_flags = FIRE_PROOF
var/max_water = 50
diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm
index d5e4186e02a14..4a5a13943e8de 100644
--- a/code/game/objects/items/fireaxe.dm
+++ b/code/game/objects/items/fireaxe.dm
@@ -12,7 +12,8 @@
throwforce = 15
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
- attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
+ attack_verb_continuous = list("attacks", "chops", "cleaves", "tears", "lacerates", "cuts")
+ attack_verb_simple = list("attack", "chop", "cleave", "tear", "lacerate", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_CUT
diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm
index 29018518ab332..eb5dfd32eb23d 100644
--- a/code/game/objects/items/food/bread.dm
+++ b/code/game/objects/items/food/bread.dm
@@ -286,7 +286,8 @@
bite_consumption = 3
w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
- attack_verb = list("touche")
+ attack_verb_continuous = list("touche's")
+ attack_verb_simple = list("touche")
tastes = list("bread" = 1)
foodtypes = GRAIN
diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm
index b6b5df75ec0c1..2bea2d0e998ce 100644
--- a/code/game/objects/items/food/misc.dm
+++ b/code/game/objects/items/food/misc.dm
@@ -165,7 +165,8 @@
attack_weight = 2
armour_penetration = 80
//wound_bonus = -50
- attack_verb = list("slapped", "slathered")
+ attack_verb_continuous = list("slaps", "slathers")
+ attack_verb_simple = list("slap", "slather")
w_class = WEIGHT_CLASS_BULKY
tastes = list("cherry" = 1, "crepe" = 1)
foodtypes = GRAIN | FRUIT | SUGAR
diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm
index e4692b910edf5..f26f5bb35e1b8 100644
--- a/code/game/objects/items/his_grace.dm
+++ b/code/game/objects/items/his_grace.dm
@@ -16,7 +16,8 @@
item_flags = ISWEAPON
force = 12
block_upgrade_walk = 1
- attack_verb = list("robusted")
+ attack_verb_continuous = list("robusts")
+ attack_verb_simple = list("robust")
hitsound = 'sound/weapons/smash.ogg'
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index d3aab132c132a..992446e2edcf5 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -282,7 +282,8 @@
w_class = WEIGHT_CLASS_HUGE
hitsound = 'sound/weapons/sear.ogg'
damtype = BURN
- attack_verb = list("punched", "cross countered", "pummeled")
+ attack_verb_continuous = list("punches", "cross counters", "pummels")
+ attack_verb_simple = list("punch", "cross counter", "pummel")
block_upgrade_walk = 0
/obj/item/nullrod/godhand/Initialize(mapload)
@@ -331,7 +332,8 @@
sharpness = IS_SHARP
bleed_force = BLEED_CUT
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
/obj/item/nullrod/claymore/darkblade
name = "dark blade"
@@ -353,7 +355,8 @@
item_state = "chainswordon"
worn_icon_state = "chainswordon"
slot_flags = ITEM_SLOT_BELT
- attack_verb = list("sawed", "tore", "cut", "chopped", "diced")
+ attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices")
+ attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice")
hitsound = 'sound/weapons/chainsawhit.ogg'
tool_behaviour = TOOL_SAW
toolspeed = 1.5 //slower than a real saw
@@ -424,7 +427,8 @@
force = 4.13
throwforce = 1
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
block_level = 1
/obj/item/nullrod/sord/on_block(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0, attack_type = MELEE_ATTACK)
@@ -450,7 +454,8 @@
slot_flags = ITEM_SLOT_BACK
sharpness = IS_SHARP
bleed_force = BLEED_CUT
- attack_verb = list("chopped", "sliced", "cut", "reaped")
+ attack_verb_continuous = list("chops", "slices", "cuts", "reaps")
+ attack_verb_simple = list("chop", "slice", "cut", "reap")
/obj/item/nullrod/scythe/Initialize(mapload)
. = ..()
@@ -464,7 +469,8 @@
worn_icon_state = "hfrequency0"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- attack_verb = list("chopped", "sliced", "cut", "zandatsu'd")
+ attack_verb_continuous = list("chops", "slices", "cuts", "zandatsu's")
+ attack_verb_simple = list("chop", "slice", "cut", "zandatsu")
hitsound = 'sound/weapons/rapierhit.ogg'
/obj/item/nullrod/scythe/spellblade
@@ -486,7 +492,8 @@
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
worn_icon_state = "talking_sword"
- attack_verb = list("chopped", "sliced", "cut")
+ attack_verb_continuous = list("chops", "slices", "cuts")
+ attack_verb_simple= list("chop", "slice", "cut")
hitsound = 'sound/weapons/rapierhit.ogg'
var/possessed = FALSE
@@ -539,7 +546,8 @@
chaplain_spawnable = FALSE
force = 30
slot_flags = ITEM_SLOT_BELT
- attack_verb = list("sawed", "tore", "cut", "chopped", "diced")
+ attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices")
+ attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice")
hitsound = 'sound/weapons/chainsawhit.ogg'
tool_behaviour = TOOL_SAW
toolspeed = 0.5 //faster than normal saw
@@ -554,7 +562,8 @@
righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_HUGE
- attack_verb = list("smashed", "bashed", "hammered", "crunched")
+ attack_verb_continuous = list("smashes", "bashes", "hammers", "crunches")
+ attack_verb_simple = list("smash", "bash", "hammer", "crunch")
attack_weight = 2
/obj/item/nullrod/chainsaw
@@ -568,7 +577,8 @@
item_flags = ABSTRACT | ISWEAPON
sharpness = IS_SHARP
bleed_force = BLEED_CUT
- attack_verb = list("sawed", "tore", "cut", "chopped", "diced")
+ attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices")
+ attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice")
hitsound = 'sound/weapons/chainsawhit.ogg'
tool_behaviour = TOOL_SAW
toolspeed = 2 //slower than a real saw
@@ -593,7 +603,8 @@
hitsound = 'sound/items/bikehorn.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_CUT
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
/obj/item/nullrod/pride_hammer
name = "Pride-struck Hammer"
@@ -604,7 +615,8 @@
throwforce = 15
w_class = 4
slot_flags = ITEM_SLOT_BACK
- attack_verb = list("attacked", "smashed", "crushed", "splattered", "cracked")
+ attack_verb_continuous = list("attacks", "smashes", "crushes", "splatters", "cracks")
+ attack_verb_simple = list("attack", "smash", "crush", "splatter", "crack")
hitsound = 'sound/weapons/blade1.ogg'
attack_weight = 2
@@ -627,7 +639,8 @@
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
- attack_verb = list("whipped", "lashed")
+ attack_verb_continuous = list("whips", "lashes")
+ attack_verb_simple = list("whip", "lash")
hitsound = 'sound/weapons/chainhit.ogg'
/obj/item/nullrod/fedora
@@ -644,7 +657,8 @@
throwforce = 30
sharpness = IS_SHARP
bleed_force = BLEED_CUT
- attack_verb = list("enlightened", "redpilled")
+ attack_verb_continuous = list("enlightens", "redpills")
+ attack_verb_simple = list("enlighten", "redpill")
/obj/item/nullrod/armblade
name = "dark blessing"
@@ -681,7 +695,8 @@
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
force = 15
- attack_verb = list("bitten", "eaten", "fin slapped")
+ attack_verb_continuous = list("bites", "eats", "fin slaps")
+ attack_verb_simple = list("bite", "eat", "fin slap")
hitsound = 'sound/weapons/bite.ogg'
var/used_blessing = FALSE
@@ -701,7 +716,8 @@
slot_flags = ITEM_SLOT_BACK
sharpness = IS_BLUNT
hitsound = "swing_hit"
- attack_verb = list("smashed", "slammed", "whacked", "thwacked")
+ attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks")
+ attack_verb_simple = list("smash", "slam", "whack", "thwack")
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "bostaff0"
item_state = "bostaff0"
@@ -721,7 +737,8 @@
bleed_force = BLEED_CUT
slot_flags = null
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
item_flags = SLOWS_WHILE_IN_HAND
/obj/item/nullrod/tribal_knife/Initialize(mapload)
@@ -749,7 +766,8 @@
worn_icon_state = "pitchfork0"
w_class = WEIGHT_CLASS_LARGE
slot_flags = ITEM_SLOT_BACK
- attack_verb = list("poked", "impaled", "pierced", "jabbed")
+ attack_verb_continuous = list("pokes", "impales", "pierces", "jabs")
+ attack_verb_simple = list("poke", "impale", "pierce", "jab")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_CUT
@@ -765,7 +783,8 @@
worn_icon_state = "pharoah_sceptre"
w_class = WEIGHT_CLASS_LARGE
slot_flags = ITEM_SLOT_BACK
- attack_verb = list("bashes", "smacks", "whacks")
+ attack_verb_continuous = list("bashes", "smacks", "whacks")
+ attack_verb_simple = list("bash", "smack", "whack")
/obj/item/nullrod/hypertool
name = "hypertool"
@@ -779,7 +798,8 @@
slot_flags = ITEM_SLOT_BELT
armour_penetration = 35
damtype = BRAIN
- attack_verb = list("pulsed", "mended", "cut")
+ attack_verb_continuous = list("pulses", "mends", "cuts")
+ attack_verb_simple = list("pulse", "mend", "cut")
hitsound = 'sound/effects/sparks4.ogg'
/obj/item/nullrod/spear
@@ -795,5 +815,6 @@
sharpness = IS_SHARP_ACCURATE
bleed_force = BLEED_CUT
w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("stabbed", "poked", "slashed", "clocked")
+ attack_verb_continuous = list("stabs", "pokes", "slashes", "clocks")
+ attack_verb_simple = list("stab", "poke", "slash", "clock")
hitsound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index 04bcfbc2fee83..9949cd605d231 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -26,7 +26,8 @@
throw_range = 5
custom_materials = list(/datum/material/iron=80)
flags_1 = CONDUCT_1
- attack_verb = list("attacked", "stabbed", "poked")
+ attack_verb_continuous = list("attacks", "stabs", "pokes")
+ attack_verb_simple = list("attack", "stab", "poke")
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, STAMINA = 0, BLEED = 0)
var/datum/reagent/forkload //used to eat omelette
@@ -84,7 +85,8 @@
throw_range = 7
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5)
w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+ attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks")
+ attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack")
custom_price = 20
tool_behaviour = TOOL_ROLLINGPIN
diff --git a/code/game/objects/items/knives.dm b/code/game/objects/items/knives.dm
index c5ddeed82da17..f62317ac872de 100644
--- a/code/game/objects/items/knives.dm
+++ b/code/game/objects/items/knives.dm
@@ -16,8 +16,8 @@
throw_speed = 3
throw_range = 6
custom_materials = list(/datum/material/iron=12000)
- attack_verb = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
- //attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
+ attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
sharpness = IS_SHARP_ACCURATE
bleed_force = BLEED_CUT
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
@@ -67,7 +67,8 @@
force = 15
throwforce = 10
custom_materials = list(/datum/material/iron=18000)
- attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("cleaves", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("cleave", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
w_class = WEIGHT_CLASS_NORMAL
custom_price = 60
@@ -116,7 +117,8 @@
embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE, "armour_block" = 60)
force = 20
throwforce = 20
- attack_verb = list("slashed", "stabbed", "sliced", "tore", "ripped", "cut")
+ attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "cuts")
+ attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "cut")
bayonet = TRUE
/obj/item/knife/combat/survival
@@ -156,7 +158,8 @@
force = 8
throwforce = 12//fuck git
custom_materials = list()
- attack_verb = list("shanked", "shivved")
+ attack_verb_continuous = list("shanks", "shivs")
+ attack_verb_simple = list("shank", "shiv")
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 0, BLEED = 0)
// Shank - Makeshift weapon that can embed on throw
@@ -173,7 +176,8 @@
throw_speed = 5 //yeets
armour_penetration = 10 //spear has 10 armour pen, I think its fitting another glass tipped item should have it too
embedding = list("embedded_pain_multiplier" = 6, "embed_chance" = 40, "embedded_fall_chance" = 5, "armour_block" = 30) // Incentive to disengage/stop chasing when stuck
- attack_verb = list("stuck", "shanked")
+ attack_verb_continuous = list("sticks", "shanks")
+ attack_verb_simple = list("stuck", "shank")
/obj/item/knife/shank/suicide_act(mob/living/user)
user.visible_message("[user] is slitting [user.p_their()] [pick("wrists", "throat")] with the shank! It looks like [user.p_theyre()] trying to commit suicide.")
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 4dbf1a193df9b..054c9f0083f01 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -80,7 +80,7 @@
w_class_on = WEIGHT_CLASS_HUGE
flags_1 = CONDUCT_1
armour_penetration = 100
- attack_verb_off = list("attacked", "chopped", "cleaved", "tore", "cut")
+ attack_verb_off = list("attacks", "chops", "cleaves", "tears", "lacerates", "cuts")
attack_verb_on = list()
light_color = "#40ceff"
@@ -98,7 +98,7 @@
throwforce = 5
throwforce_on = 35 //Does a lot of damage on throw, but will embed
hitsound = "swing_hit" //it starts deactivated
- attack_verb_off = list("tapped", "poked")
+ attack_verb_off = list("taps", "pokes")
throw_speed = 3
throw_range = 5
sharpness = IS_SHARP
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index b0e6ea72f9f53..2992edcff8098 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -22,7 +22,8 @@
force = 10
throwforce = 7
w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("flogged", "whipped", "lashed", "disciplined")
+ attack_verb_continuous = list("flogs", "whips", "lashes", "disciplines")
+ attack_verb_simple = list("flog", "whip", "lash", "discipline")
hitsound = 'sound/weapons/chainhit.ogg'
custom_materials = list(/datum/material/iron = 1000)
@@ -43,7 +44,8 @@
force = 20
throwforce = 10
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
sharpness = IS_SHARP
bleed_force = BLEED_CUT
@@ -70,7 +72,8 @@
armour_penetration = 75
sharpness = IS_SHARP
bleed_force = BLEED_CUT
- attack_verb = list("slashed", "cut")
+ attack_verb_continuous = list("slashes", "cuts")
+ attack_verb_simple = list("slash", "cut")
hitsound = 'sound/weapons/rapierhit.ogg'
custom_materials = list(/datum/material/iron = 1000)
@@ -575,7 +578,8 @@
item_state = on_item_state
w_class = weight_class_on
force = force_on
- attack_verb = list("smacked", "struck", "cracked", "beaten")
+ attack_verb_continuous = list("smacks", "strikes", "cracks", "beats")
+ attack_verb_simple = list("smack", "strike", "crack", "beat")
else
to_chat(user, desc["local_off"])
icon_state = off_icon_state
@@ -583,7 +587,8 @@
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
force = force_off
- attack_verb = list("hit", "poked")
+ attack_verb_continuous = list("hits", "pokes")
+ attack_verb_simple = list("hit", "poke")
playsound(src.loc, on_sound, 50, 1)
add_fingerprint(user)
@@ -636,7 +641,8 @@
item_state = on_item_state
w_class = weight_class_on
force = force_on
- attack_verb = list("smacked", "struck", "cracked", "beaten")
+ attack_verb_continuous = list("smacks", "strikes", "cracks", "beats")
+ attack_verb_simple = list("smack", "strike", "crack", "beat")
else
to_chat(user, desc["local_off"])
icon_state = off_icon_state
@@ -644,7 +650,8 @@
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
force = force_off
- attack_verb = list("hit", "poked")
+ attack_verb_continuous = list("hits", "pokes")
+ attack_verb_simple = list("hit", "poke")
playsound(src.loc, on_sound, 50, TRUE)
add_fingerprint(user)
@@ -893,7 +900,8 @@
force = 0.001 //"Some attack noises shit"
reach = 3
w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("flogged", "whipped", "lashed", "disciplined")
+ attack_verb_continuous = list("flogs", "whips", "lashes", "disciplines")
+ attack_verb_simple = list("flog", "whip", "lash", "discipline")
hitsound = 'sound/weapons/whip.ogg'
/obj/item/melee/curator_whip/attack(mob/living/target, mob/living/user)
@@ -946,7 +954,8 @@
w_class = WEIGHT_CLASS_SMALL
item_flags = ISWEAPON
force = 0
- attack_verb = list("hit", "poked")
+ attack_verb_continuous = list("hits", "pokes")
+ attack_verb_simple = list("hit", "poke")
var/obj/item/food/sausage/held_sausage
var/static/list/ovens
var/on = FALSE
@@ -1058,7 +1067,8 @@
force = 0
throwforce = 0
w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("repelled")
+ attack_verb_continuous = list("repells")
+ attack_verb_simple = list("repell")
var/cooldown = 0
var/knockbackpower = 6
diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm
index be7012a8694ee..a556f326681e2 100644
--- a/code/game/objects/items/melee/transforming.dm
+++ b/code/game/objects/items/melee/transforming.dm
@@ -8,8 +8,8 @@
var/bleed_force_on = BLEED_CUT
var/icon_state_on = "axe1"
var/hitsound_on = 'sound/weapons/blade1.ogg'
- var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
- var/list/attack_verb_off = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ var/list/attack_verb_on = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ var/list/attack_verb_off = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
w_class = WEIGHT_CLASS_SMALL
var/bonus_active = FALSE //If the faction damage bonus is active
var/list/nemesis_factions //Any mob with a faction that exists in this list will take bonus damage/effects
@@ -26,10 +26,10 @@
. = ..()
if(active)
if(attack_verb_on.len)
- attack_verb = attack_verb_on
+ attack_verb_continuous = attack_verb_on
else
if(attack_verb_off.len)
- attack_verb = attack_verb_off
+ attack_verb_continuous = attack_verb_off
if(embedding)
updateEmbedding()
if(is_sharp())
@@ -60,7 +60,7 @@
hitsound = hitsound_on
throw_speed = 4
if(attack_verb_on.len)
- attack_verb = attack_verb_on
+ attack_verb_continuous = attack_verb_on
icon_state = icon_state_on
w_class = w_class_on
bleed_force = bleed_force_on
@@ -72,7 +72,7 @@
hitsound = initial(hitsound)
throw_speed = initial(throw_speed)
if(attack_verb_off.len)
- attack_verb = attack_verb_off
+ attack_verb_continuous = attack_verb_off
icon_state = initial(icon_state)
w_class = initial(w_class)
bleed_force = initial(bleed_force)
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index 8b6483a41d13a..a953561b53fbb 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -10,7 +10,8 @@
throw_speed = 2
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("warned", "cautioned", "smashed")
+ attack_verb_continuous = list("warns", "cautions", "smashes")
+ attack_verb_simple = list("warn", "caution", "smash")
/obj/item/choice_beacon
name = "choice beacon"
@@ -371,7 +372,8 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "skub"
w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("skubbed")
+ attack_verb_continuous = list("skubs")
+ attack_verb_simple = list("skub")
/obj/item/skub/suicide_act(mob/living/user)
user.visible_message("[user] has declared themself as anti-skub! The skub tears them apart!")
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
index 99035dc38fca4..aa87ec7cd0bb2 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -11,7 +11,8 @@
throw_speed = 3
throw_range = 7
w_class = WEIGHT_CLASS_LARGE
- attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
+ attack_verb_continuous = list("mops", "bashes", "bludgeons", "whacks")
+ attack_verb_simple = list("mop", "bash", "bludgeon", "whack")
resistance_flags = FLAMMABLE
var/mopping = 0
var/mopcount = 0
@@ -122,7 +123,8 @@
force = 10
throwforce = 18
throw_speed = 4
- attack_verb = list("mopped", "stabbed", "shanked", "jousted")
+ attack_verb_continuous = list("mops", "stabs", "shanks", "jousts")
+ attack_verb_simple = list("mop", "stab", "shank", "joust")
sharpness = IS_SHARP
bleed_force = BLEED_SURFACE
embedding = list("armour_block" = 40)
diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm
index 3030ac720eeed..8389506970502 100644
--- a/code/game/objects/items/pet_carrier.dm
+++ b/code/game/objects/items/pet_carrier.dm
@@ -12,7 +12,8 @@
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
force = 5
- attack_verb = list("bashed", "carried")
+ attack_verb_continuous = list("bashes", "carries")
+ attack_verb_simple = list("bash", "carry")
w_class = WEIGHT_CLASS_BULKY
throw_speed = 2
throw_range = 3
diff --git a/code/game/objects/items/pitchfork.dm b/code/game/objects/items/pitchfork.dm
index 4bf6ed8cda10e..8cc87560fcb22 100644
--- a/code/game/objects/items/pitchfork.dm
+++ b/code/game/objects/items/pitchfork.dm
@@ -10,7 +10,8 @@
block_upgrade_walk = 1
w_class = WEIGHT_CLASS_BULKY
item_flags = ISWEAPON
- attack_verb = list("attacked", "impaled", "pierced")
+ attack_verb_continuous = list("attacks", "impales", "pierces")
+ attack_verb_simple = list("attack", "impale", "pierce")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_CUT
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 60a67fdd8c713..b9e279e84ab4c 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -5,7 +5,8 @@
lefthand_file = 'icons/mob/inhands/plushes_lefthand.dmi'
righthand_file = 'icons/mob/inhands/plushes_righthand.dmi'
icon_state = "debug"
- attack_verb = list("thumped", "whomped", "bumped")
+ attack_verb_continuous = list("thumps", "whomps", "bumps")
+ attack_verb_simple = list("thump", "whomp", "bump")
w_class = WEIGHT_CLASS_SMALL
item_flags = ISWEAPON
resistance_flags = FLAMMABLE
@@ -370,14 +371,16 @@
name = "space carp plushie"
desc = "An adorable stuffed toy that resembles a space carp."
icon_state = "carpplush"
- attack_verb = list("bitten", "eaten", "fin slapped")
+ attack_verb_continuous = list("bites", "eats", "fin slaps")
+ attack_verb_simple = list("bite", "eat", "fin slap")
squeak_override = list('sound/weapons/bite.ogg' = 1)
/obj/item/toy/plush/bubbleplush
name = "\improper Bubblegum plushie"
desc = "The friendly red demon that gives good miners gifts."
icon_state = "bubbleplush"
- attack_verb = list("rent")
+ attack_verb_continuous = list("rents")
+ attack_verb_simple = list("rent")
squeak_override = list('sound/magic/demon_attack1.ogg' = 1)
/obj/item/toy/plush/plushvar
@@ -498,7 +501,8 @@
desc = "An adorable stuffed toy that resembles a lizardperson."
icon_state = "map_plushie_lizard"
greyscale_config = /datum/greyscale_config/plush_lizard
- attack_verb = list("clawed", "hissed", "tail slapped")
+ attack_verb_continuous = list("claws", "hisses", "tail slaps")
+ attack_verb_simple = list("claw", "hiss", "tail slap")
squeak_override = list('sound/weapons/slash.ogg' = 1)
/obj/item/toy/plush/lizard_plushie/Initialize(mapload)
@@ -526,8 +530,8 @@
icon_state = "map_plushie_spacelizard"
greyscale_config = /datum/greyscale_config/plush_spacelizard
// space lizards can't hit people with their tail, it's stuck in their suit
- attack_verb = list("claws", "hisses", "bops")
- //attack_verb_simple = list("claw", "hiss", "bops")
+ attack_verb_continuous = list("claws", "hisses", "bops")
+ attack_verb_simple = list("claw", "hiss", "bops")
/obj/item/toy/plush/lizard_plushie/space/green
desc = "An adorable stuffed toy that resembles a very determined spacefaring green lizardperson. To infinity and beyond, little guy. This one fills you with nostalgia and soul."
@@ -537,21 +541,24 @@
name = "snake plushie"
desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing."
icon_state = "snakeplush"
- attack_verb = list("bitten", "hissed", "tail slapped")
+ attack_verb_continuous = list("bites", "hisses", "tail slaps")
+ attack_verb_simple = list("bite", "hiss", "tail slap")
squeak_override = list('sound/weapons/bite.ogg' = 1)
/obj/item/toy/plush/nukeplushie
name = "operative plushie"
desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious."
icon_state = "nukeplush"
- attack_verb = list("shot", "nuked", "detonated")
+ attack_verb_continuous = list("shoots", "nukes", "detonates")
+ attack_verb_simple = list("shoot", "nuke", "detonate")
squeak_override = list('sound/effects/hit_punch.ogg' = 1)
/obj/item/toy/plush/slimeplushie
name = "slime plushie"
desc = "An adorable stuffed toy that resembles a purple slime. It is practically just a hacky sack."
icon_state = "slimeplush"
- attack_verb = list("blorbled", "slimed", "absorbed")
+ attack_verb_continuous = list("blorbles", "slimes", "absorbs")
+ attack_verb_simple = list("blorble", "slime", "absorb")
squeak_override = list('sound/effects/blobattack.ogg' = 1)
gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
/// Most of the following is just stolen from the moth plush code for the slimes
@@ -623,7 +630,8 @@
name = "bee plushie"
desc = "A cute toy that resembles an even cuter bee."
icon_state = "beeplush"
- attack_verb = list("stung")
+ attack_verb_continuous = list("stings")
+ attack_verb_simple = list("sting")
gender = FEMALE
squeak_override = list('sound/voice/moth/scream_moth.ogg' = 1)
@@ -631,14 +639,16 @@
name = "runner plushie"
desc = "A plushie depicting a xenomorph runner, made to commemorate the centenary of the Battle of LV-426. Much cuddlier than the real thing."
icon_state = "rounyplush"
- attack_verb = list("slashes", "bites", "charges")
+ attack_verb_continuous = list("slashes", "bites", "charges")
+ attack_verb_simple = list("slash", "bite", "charge")
squeak_override = list('sound/weapons/bite.ogg' = 1)
/obj/item/toy/plush/moth
name = "moth plushie"
desc = "An adorable mothperson plushie. It's a huggable bug!"
icon_state = "moffplush"
- attack_verb = list("fluttered", "flapped")
+ attack_verb_continuous = list("flutters", "flaps")
+ attack_verb_simple = list("flutter", "flap")
squeak_override = list('sound/voice/moth/scream_moth.ogg' = 1)
///Used to track how many people killed themselves with item/toy/plush/moth
var/suicide_count = 0
diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm
index 62301d1d3afc3..55fe304b9fa8d 100644
--- a/code/game/objects/items/pneumaticCannon.dm
+++ b/code/game/objects/items/pneumaticCannon.dm
@@ -8,7 +8,8 @@
w_class = WEIGHT_CLASS_BULKY
item_flags = ISWEAPON
force = 8 //Very heavy
- attack_verb = list("bludgeoned", "smashed", "beaten")
+ attack_verb_continuous = list("bludgeons", "smashes", "beats")
+ attack_verb_simple = list("bludgeon", "smash", "beat")
icon = 'icons/obj/pneumaticCannon.dmi'
icon_state = "pneumaticCannon"
item_state = "bulldog"
diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm
index c730ba8171fdf..f558447a11618 100644
--- a/code/game/objects/items/powerfist.dm
+++ b/code/game/objects/items/powerfist.dm
@@ -6,7 +6,8 @@
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
flags_1 = CONDUCT_1
- attack_verb = list("whacked", "fisted", "power-punched")
+ attack_verb_continuous = list("whacks", "fists", "power-punches")
+ attack_verb_simple = list("whack", "fist", "power-punch")
force = 20
attack_weight = 1
throwforce = 10
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index 1f30d22dd2618..30a5b22125a64 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -5,7 +5,8 @@
icon_state = "banner"
item_state = "banner"
force = 8
- attack_verb = list("forcefully inspired", "violently encouraged", "relentlessly galvanized")
+ attack_verb_continuous = list("forcefully inspires", "violently encourages", "relentlessly galvanizes")
+ attack_verb_simple = list("forcefully inspire", "violently encourage", "relentlessly galvanize")
lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
var/inspiration_available = TRUE //If this banner can be used to inspire crew
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index e4f792a46c54d..86000c43e0ecf 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -98,7 +98,8 @@
throw_range = 3
w_class = WEIGHT_CLASS_BULKY
custom_materials = list(/datum/material/glass=7500, /datum/material/iron=1000)
- attack_verb = list("shoved", "bashed")
+ attack_verb_continuous = list("shoves", "bashes")
+ attack_verb_simple = list("shove", "bash")
var/cooldown = 0 //shield bash cooldown. based on world.time
transparent = TRUE
@@ -256,7 +257,8 @@
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
w_class = WEIGHT_CLASS_TINY
- attack_verb = list("shoved", "bashed")
+ attack_verb_continuous = list("shoves", "bashes")
+ attack_verb_simple = list("shove", "bash")
throw_range = 5
force = 3
throwforce = 3
diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm
index 05c042ec6e23a..99e9ac8c494ad 100644
--- a/code/game/objects/items/signs.dm
+++ b/code/game/objects/items/signs.dm
@@ -4,9 +4,10 @@
desc = "It's blank."
force = 5
w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("bashed","smacked")
+ attack_verb_continuous = list("bashes", "smacks")
+ attack_verb_simple = list("bash", "smack")
resistance_flags = FLAMMABLE
-
+
var/label = ""
var/last_wave = 0
diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm
index fbf2f8b1ee2b5..ae7aaa4f2a6aa 100644
--- a/code/game/objects/items/spear.dm
+++ b/code/game/objects/items/spear.dm
@@ -16,7 +16,8 @@
armour_penetration = 10
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
+ attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores")
+ attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore")
sharpness = IS_SHARP
bleed_force = BLEED_CUT
max_integrity = 200
@@ -136,7 +137,8 @@
/obj/item/spear/grey_tide
name = "\improper Grey Tide"
desc = "Recovered from the aftermath of a revolt aboard Defense Outpost Theta Aegis, in which a seemingly endless tide of Assistants caused heavy casualities among Nanotrasen military forces."
- attack_verb = list("gored")
+ attack_verb_continuous = list("gores")
+ attack_verb_simple = list("gore")
force=15
/obj/item/spear/grey_tide/ComponentInitialize()
@@ -190,7 +192,8 @@
embedding = list("armour_block" = 30, "max_damage_mult" = 0.5)
armour_penetration = 10
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "poked", "jabbed", "tore", "gored")
+ attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores")
+ attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore")
sharpness = IS_SHARP
bleed_force = BLEED_CUT
diff --git a/code/game/objects/items/stacks/rods/rods.dm b/code/game/objects/items/stacks/rods/rods.dm
index b16603af6d8fc..4ade958ee737a 100644
--- a/code/game/objects/items/stacks/rods/rods.dm
+++ b/code/game/objects/items/stacks/rods/rods.dm
@@ -13,7 +13,8 @@
mats_per_unit = list(/datum/material/iron=1000)
max_amount = 50
merge_type = /obj/item/stack/rods
- attack_verb = list("hit", "bludgeoned", "whacked")
+ attack_verb_continuous = list("hits", "bludgeons", "whacks")
+ attack_verb_simple = list("hit", "bludgeon", "whack")
hitsound = 'sound/weapons/grenadelaunch.ogg'
embedding = list()
novariants = TRUE
diff --git a/code/game/objects/items/stacks/sheets/mineral/glass.dm b/code/game/objects/items/stacks/sheets/mineral/glass.dm
index ac138bab86486..80f392130647d 100644
--- a/code/game/objects/items/stacks/sheets/mineral/glass.dm
+++ b/code/game/objects/items/stacks/sheets/mineral/glass.dm
@@ -211,7 +211,8 @@
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
custom_materials = list(/datum/material/glass=MINERAL_MATERIAL_AMOUNT)
- attack_verb = list("stabbed", "slashed", "sliced", "cut")
+ attack_verb_continuous = list("stabs", "slashes", "slices", "cuts")
+ attack_verb_simple = list("stab", "slash", "slice", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
resistance_flags = ACID_PROOF
armor = list(MELEE = 100, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 100, STAMINA = 0, BLEED = 0)
diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm
index 1103a669f4b75..6a5ee9649457a 100644
--- a/code/game/objects/items/stacks/sheets/sheets.dm
+++ b/code/game/objects/items/stacks/sheets/sheets.dm
@@ -8,7 +8,8 @@
max_amount = 50
throw_speed = 1
throw_range = 3
- attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
+ attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "smashes")
+ attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash")
novariants = FALSE
material_flags = MATERIAL_EFFECTS
var/sheettype = null //this is used for girders in the creation of walls/false walls
diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm
index 4ef4e66f43edf..0fe25744382a5 100644
--- a/code/game/objects/items/stacks/tiles/light.dm
+++ b/code/game/objects/items/stacks/tiles/light.dm
@@ -41,7 +41,8 @@
desc = "A floor tile, made out of glass. It produces light."
icon_state = "tile_e"
flags_1 = CONDUCT_1
- attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
+ attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "smashes")
+ attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash")
turf_type = /turf/open/floor/light
var/state = 0
merge_type = /obj/item/stack/tile/light
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 7cf2dc093af5e..5be91934e8016 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -9,7 +9,8 @@
lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
- attack_verb = list("whipped", "lashed", "disciplined")
+ attack_verb_continuous = list("whips", "lashes", "disciplines")
+ attack_verb_simple = list("whip", "lash", "discipline")
max_integrity = 300
var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index 9f6e3ab78cc3a..d18fcc98415a5 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -262,7 +262,8 @@
hitsound = 'sound/weapons/sear.ogg'
damtype = BURN
name = "Syndicate Tome"
- attack_verb = list("attacked", "burned", "blessed", "damned", "scorched")
+ attack_verb_continuous = list("attacks", "burns", "blesses", "damns", "scorches")
+ attack_verb_simple = list("attack", "burn", "bless", "damn", "scorch")
var/uses = 1
/obj/item/storage/book/bible/syndicate/attack_self(mob/living/carbon/human/H)
diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm
index ec35954e802d5..7b8c9a723c6d4 100644
--- a/code/game/objects/items/storage/briefcase.dm
+++ b/code/game/objects/items/storage/briefcase.dm
@@ -11,7 +11,8 @@
throw_speed = 2
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+ attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks")
+ attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack")
resistance_flags = FLAMMABLE
max_integrity = 150
var/folder_path = /obj/item/folder //this is the path of the folder that gets spawned in New()
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index 9812ad7f8933e..58cfd2010c330 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -133,7 +133,8 @@
throw_speed = 2
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+ attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks")
+ attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack")
/obj/item/storage/secure/briefcase/PopulateContents()
new /obj/item/paper(src)
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 096fa96e0ca53..25f49299f4c90 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -13,7 +13,8 @@
throw_range = 7
w_class = WEIGHT_CLASS_BULKY
item_flags = ISWEAPON
- attack_verb = list("robusted")
+ attack_verb_continuous = list("robusts")
+ attack_verb_simple = list("robust")
hitsound = 'sound/weapons/smash.ogg'
custom_materials = list(/datum/material/iron = 500) //Toolboxes by default use iron as their core, custom material.
material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR
@@ -98,7 +99,8 @@
throw_speed = 2
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("robusted")
+ attack_verb_continuous = list("robusts")
+ attack_verb_simple = list("robust")
hitsound = 'sound/weapons/smash.ogg'
/obj/item/storage/toolbox/mechanical/old/clean
@@ -200,7 +202,8 @@
has_latches = FALSE
resistance_flags = FIRE_PROOF | ACID_PROOF
w_class = WEIGHT_CLASS_HUGE
- attack_verb = list("robusted", "crushed", "smashed")
+ attack_verb_continuous = list("robusts")
+ attack_verb_simple = list("robust")
material_flags = NONE
/obj/item/storage/toolbox/brass/ComponentInitialize()
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index c9f8c581e1732..3db83f01c93c6 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -11,7 +11,8 @@
throwforce = 7
w_class = WEIGHT_CLASS_LARGE
item_flags = ISWEAPON
- attack_verb = list("enforced the law upon")
+ attack_verb_continuous = list("enforces the law upon")
+ attack_verb_simple = list("enforce the law upon")
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, BIO = 0, RAD = 0, FIRE = 80, ACID = 80, STAMINA = 0, BLEED = 0)
var/stunforce = 40
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index 98e0ecc407fe4..7caa4d083a85e 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -13,7 +13,8 @@
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=50)
- attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
+ attack_verb_continuous = list("attacks", "bashes", "batters", "bludgeons", "whacks")
+ attack_verb_simple = list("attack", "bash", "batter", "bludgeon", "whack")
tool_behaviour = TOOL_CROWBAR
toolspeed = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30, STAMINA = 0, BLEED = 0)
diff --git a/code/game/objects/items/tools/powertools.dm b/code/game/objects/items/tools/powertools.dm
index 935a5e82cc887..e53106267b310 100644
--- a/code/game/objects/items/tools/powertools.dm
+++ b/code/game/objects/items/tools/powertools.dm
@@ -51,7 +51,8 @@
hitsound = null
- attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
+ attack_verb_continuous = list("attacks", "bashes", "batters", "bludgeons", "whacks")
+ attack_verb_simple = list("attack", "bash", "batter", "bludgeon", "whack")
throw_range = 7
/obj/item/powertool/hand_drill/proc/become_screwdriver()
@@ -60,7 +61,8 @@
hitsound = 'sound/items/drill_hit.ogg'
- attack_verb = list("drilled", "screwed", "jabbed")
+ attack_verb_continuous = list("drills", "screws", "jabs", "whacks")
+ attack_verb_simple = list("drill", "screw", "jab", "whack")
throw_range = 3
/obj/item/powertool/hand_drill/suicide_act(mob/living/user)
@@ -96,7 +98,8 @@
force = 15
throwforce = 7
- attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
+ attack_verb_continuous = list("attacks", "bashes", "batters", "bludgeons", "whacks")
+ attack_verb_simple = list("attack", "bash", "batter", "bludgeon", "whack")
/obj/item/powertool/jaws_of_life/Initialize(mapload)
. = ..()
@@ -117,7 +120,8 @@
usesound = 'sound/items/jaws_cut.ogg'
- attack_verb = list("pinched", "nipped")
+ attack_verb_continuous = list("pinches", "nips")
+ attack_verb_simple = list("pinch", "nip")
force = 6
throw_speed = 3
@@ -129,7 +133,8 @@
usesound = 'sound/items/jaws_pry.ogg'
- attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
+ attack_verb_continuous = list("attacks", "bashes", "batters", "bludgeons", "whacks")
+ attack_verb_simple = list("attack", "bash", "batter", "bludgeon", "whack")
force = 15
throw_speed = 2
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index 3db95599ce19f..59b08705a8ea2 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -16,7 +16,8 @@
throw_speed = 3
throw_range = 5
custom_materials = list(/datum/material/iron=75)
- attack_verb = list("stabbed")
+ attack_verb_continuous = list("stabs")
+ attack_verb_simple = list("stab")
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = list('sound/items/screwdriver.ogg', 'sound/items/screwdriver2.ogg')
tool_behaviour = TOOL_SCREWDRIVER
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index 076d2ae251d9e..485c62322bd7a 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -14,7 +14,8 @@
throw_range = 7
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=80)
- attack_verb = list("pinched", "nipped")
+ attack_verb_continuous = list("pinches", "nips")
+ attack_verb_simple = list("pinch", "nip")
hitsound = 'sound/items/wirecutter.ogg'
usesound = 'sound/items/wirecutter.ogg'
drop_sound = 'sound/items/handling/wirecutter_drop.ogg'
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index 2008a03831b1c..28c09bf616be7 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -16,7 +16,8 @@
custom_materials = list(/datum/material/iron=150)
drop_sound = 'sound/items/handling/wrench_drop.ogg'
pickup_sound = 'sound/items/handling/wrench_pickup.ogg'
- attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
+ attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks")
+ attack_verb_simple = list("bash", "batter", "bludgeon", "whack")
tool_behaviour = TOOL_WRENCH
toolspeed = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30, STAMINA = 0, BLEED = 0)
@@ -47,7 +48,8 @@
icon_state = "wrench_medical"
force = 2 //MEDICAL
throwforce = 4
- attack_verb = list("healed", "medicaled", "tapped", "poked", "analyzed") //"cobbyed"
+ attack_verb_continuous = list("heals", "medicals", "taps", "pokes", "analyzes") //"cobbyed"
+ attack_verb_simple = list("heal", "medical", "tap", "poke", "analyze")
///var to hold the name of the person who suicided
var/suicider
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 3639f4e3314ce..7ef733e8d7814 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -195,7 +195,8 @@
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=10, /datum/material/glass=10)
- attack_verb = list("struck", "pistol whipped", "hit", "bashed")
+ attack_verb_continuous = list("strikes", "pistol whips", "hits", "bashes")
+ attack_verb_simple = list("strike", "pistol whip", "hit", "bash")
var/bullets = 7
/obj/item/toy/gun/examine(mob/user)
@@ -272,7 +273,8 @@
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
var/active = 0
w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("attacked", "struck", "hit")
+ attack_verb_continuous = list("attacks", "strikes", "hits")
+ attack_verb_simple = list("attack", "strike", "hit")
var/hacked = FALSE
var/saber_color
@@ -335,7 +337,8 @@
item_state = "arm_blade"
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
- attack_verb = list("pricked", "absorbed", "gored")
+ attack_verb_continuous = list("pricks", "absorbs", "gores")
+ attack_verb_simple = list("prick", "absorb", "gore")
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
item_flags = ISWEAPON
@@ -351,7 +354,8 @@
item_state = "baton"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
- attack_verb = list("batonged", "stunned", "hit")
+ attack_verb_continuous = list("batongs", "stuns", "hits")
+ attack_verb_simple = list("batong", "stun", "hit")
w_class = WEIGHT_CLASS_SMALL
item_flags = ISWEAPON
@@ -367,7 +371,8 @@
hitsound = 'sound/weapons/smash.ogg'
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
- attack_verb = list("robusted")
+ attack_verb_continuous = list("robusts")
+ attack_verb_simple = list("robust")
item_flags = ISWEAPON
/obj/item/toy/windupToolbox/attack_self(mob/user)
@@ -414,7 +419,8 @@
throw_speed = 3
throw_range = 5
twohand_force = 0
- attack_verb = list("attacked", "struck", "hit")
+ attack_verb_continuous = list("attacks", "strikes", "hits")
+ attack_verb_simple = list("attack", "strike", "hit")
block_upgrade_walk = 0
block_level = 0
item_flags = ISWEAPON
@@ -448,7 +454,8 @@
force = 5
throwforce = 5
w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("attacked", "slashed", "stabbed", "sliced")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices")
+ attack_verb_simple = list("attack", "slash", "stab", "slice")
hitsound = 'sound/weapons/bladeslice.ogg'
block_flags = BLOCKING_ACTIVE | BLOCKING_PROJECTILE //if it some how gets block level, katanas block projectiles for the meme
item_flags = ISWEAPON
@@ -722,7 +729,8 @@
var/card_throwforce = 0
var/card_throw_speed = 3
var/card_throw_range = 7
- var/list/card_attack_verb = list("attacked")
+ var/list/card_attack_verb_continuous = list("attacks")
+ var/list/card_attack_verb_simple = list("attack")
var/card_sharpness
/obj/item/toy/cards/suicide_act(mob/living/carbon/user)
@@ -925,7 +933,8 @@
newobj.card_throwforce = sourceobj.card_throwforce
newobj.card_throw_speed = sourceobj.card_throw_speed
newobj.card_throw_range = sourceobj.card_throw_range
- newobj.card_attack_verb = sourceobj.card_attack_verb
+ newobj.card_attack_verb_continuous = sourceobj.card_attack_verb_continuous
+ newobj.card_attack_verb_simple = sourceobj.card_attack_verb_simple
newobj.resistance_flags = sourceobj.resistance_flags
/**
@@ -1050,8 +1059,10 @@
newobj.throw_speed = newobj.card_throw_speed
newobj.card_throw_range = sourceobj.card_throw_range
newobj.throw_range = newobj.card_throw_range
- newobj.card_attack_verb = sourceobj.card_attack_verb
- newobj.attack_verb = newobj.card_attack_verb
+ newobj.card_attack_verb_continuous = sourceobj.card_attack_verb_continuous
+ newobj.attack_verb_continuous = newobj.card_attack_verb_continuous
+ newobj.card_attack_verb_simple = sourceobj.card_attack_verb_simple
+ newobj.attack_verb_simple = newobj.card_attack_verb_simple
/*
|| Syndicate playing cards, for pretending you're Gambit and playing poker for the nuke disk. ||
@@ -1069,7 +1080,8 @@
card_sharpness = IS_SHARP
bleed_force = BLEED_SURFACE
card_throw_range = 7
- card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
+ card_attack_verb_continuous = list("attacks", "slices", "dices", "slashes", "cuts")
+ card_attack_verb_simple = list("attack", "slice", "dice", "slash", "cut")
resistance_flags = NONE
/*
@@ -1540,7 +1552,8 @@
icon = 'icons/obj/heretic.dmi'
icon_state = "book"
w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("sacrificed", "transmuted", "grasped", "cursed")
+ attack_verb_continuous = list("sacrifices", "transmutes", "grasps", "curses")
+ attack_verb_simple = list("sacrifice", "transmute", "grasp", "curse")
var/open = FALSE
/obj/item/toy/eldrich_book/attack_self(mob/user)
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 195c3adacb1c4..b2bbb5945c85b 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -10,7 +10,8 @@
item_flags = ISWEAPON
throw_speed = 3
throw_range = 7
- attack_verb = list("banned")
+ attack_verb_continuous = list("bans")
+ attack_verb_simple = list("ban")
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 70, STAMINA = 0, BLEED = 0)
resistance_flags = FIRE_PROOF
@@ -46,7 +47,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_LARGE
item_flags = ISWEAPON
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
/obj/item/sord/suicide_act(mob/living/user)
user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \
@@ -76,7 +78,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_NORMAL
item_flags = ISWEAPON
attack_weight = 1
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
block_power = 40
block_upgrade_walk = 1
block_level = 1
@@ -101,7 +104,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
item_flags = DROPDEL | ISWEAPON //dropdel occurs because you lost an arm
slot_flags = null
light_range = 3
- attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS
+ attack_verb_continuous = list("brutalizes", "eviscerates", "disembowels", "hacks", "carves", "cleaves") //ONLY THE MOST VISCERAL ATTACK VERBS
+ attack_verb_simple = list("brutalize", "eviscerate", "disembowel", "hack", "carve", "cleave")
var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE
var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK
@@ -234,7 +238,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
armour_penetration = 15
w_class = WEIGHT_CLASS_LARGE
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
block_level = 0
block_power = 30
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50, STAMINA = 0, BLEED = 0)
@@ -254,7 +259,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_HUGE
item_flags = ISWEAPON
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
block_power = 20
block_level = 1
block_upgrade_walk = 1
@@ -283,7 +289,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_NORMAL
item_flags = ISWEAPON
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=75)
- attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
+ attack_verb_continuous = list("hits", "bludgeons", "whacks", "bonks")
+ attack_verb_simple = list("hit", "bludgeon", "whack", "bonk")
/obj/item/wirerod/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/shard))
@@ -359,7 +366,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_BULKY
hitsound = 'sound/weapons/bladeslice.ogg'
throw_range = 0 //throwing these invalidates the speargun
- attack_verb = list("stabbed", "ripped", "gored", "impaled")
+ attack_verb_continuous = list("stabs", "rips", "gores", "impales")
+ attack_verb_simple = list("stab", "rip", "gore", "impale")
embedding = list("pain_mult" = 8, "embed_chance" = 1000, "fall_chance" = 0, "armour_block" = 100)
/obj/item/switchblade
@@ -377,7 +385,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_range = 6
custom_materials = list(/datum/material/iron=12000)
hitsound = 'sound/weapons/genhit.ogg'
- attack_verb = list("stubbed", "poked")
+ attack_verb_continuous = list("stubs", "pokes")
+ attack_verb_simple = list("stub", "poke")
resistance_flags = FIRE_PROOF
var/extended = 0
var/extended_force = 20
@@ -392,7 +401,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_NORMAL
throwforce = extended_throwforce
icon_state = extended_icon_state
- attack_verb = list("slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_CUT
@@ -401,7 +411,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_SMALL
throwforce = initial(throwforce)
icon_state = initial(icon_state)
- attack_verb = list("stubbed", "poked")
+ attack_verb_continuous = list("stubs", "pokes")
+ attack_verb_simple = list("stub", "poke")
hitsound = 'sound/weapons/genhit.ogg'
sharpness = IS_BLUNT
bleed_force = 0
@@ -441,7 +452,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_range = 4
w_class = WEIGHT_CLASS_SMALL
item_flags = ISWEAPON
- attack_verb = list("called", "rang")
+ attack_verb_continuous = list("calls", "rings")
+ attack_verb_simple = list("call", "ring")
hitsound = 'sound/weapons/ring.ogg'
/obj/item/phone/suicide_act(mob/living/user)
@@ -464,7 +476,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 5
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=50)
- attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
+ attack_verb_continuous = list("bludgeons", "whacks", "disciplines", "thrashes")
+ attack_verb_simple = list("bludgeon", "whack", "discipline", "thrash")
/obj/item/staff
name = "wizard staff"
@@ -481,7 +494,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_SMALL
item_flags = ISWEAPON
armour_penetration = 100
- attack_verb = list("bludgeoned", "whacked", "disciplined")
+ attack_verb_continuous = list("bludgeons", "whacks", "disciplines")
+ attack_verb_simple = list("bludgeon", "whack", "discipline")
resistance_flags = FLAMMABLE
/obj/item/staff/broom
@@ -542,7 +556,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_speed = 0
sharpness = IS_SHARP
bleed_force = BLEED_DEEP_WOUND
- attack_verb = list("sawed", "tore", "cut", "chopped", "diced")
+ attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices")
+ attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice")
hitsound = 'sound/weapons/chainsawhit.ogg'
tool_behaviour = TOOL_SAW
toolspeed = 1
@@ -618,7 +633,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 10
throw_speed = 5
throw_range = 2
- attack_verb = list("busted")
+ attack_verb_continuous = list("busts")
+ attack_verb_simple = list("bust")
var/impressiveness = 45
/obj/item/statuebust/Initialize(mapload)
@@ -651,7 +667,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 12
throwforce = 4
w_class = WEIGHT_CLASS_LARGE
- attack_verb = list("smacked", "whacked", "slammed", "smashed")
+ attack_verb_continuous = list("smacks", "whacks", "slams", "smashes")
+ attack_verb_simple = list("smack", "whack", "slam", "smash")
///The vehicle counterpart for the board
var/board_item_type = /obj/vehicle/ridden/scooter/skateboard
@@ -695,7 +712,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
attack_weight = 2
force = 13
throwforce = 6
- attack_verb = list("beat", "smacked")
+ attack_verb_continuous = list("beats", "smacks")
+ attack_verb_simple = list("beat", "smack")
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 3.5)
w_class = WEIGHT_CLASS_HUGE
var/homerun_ready = 0
@@ -767,7 +785,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
force = 1
throwforce = 1
- attack_verb = list("swatted", "smacked")
+ attack_verb_continuous = list("swats", "smacks")
+ attack_verb_simple = list("swat", "smack")
hitsound = 'sound/effects/snap.ogg'
w_class = WEIGHT_CLASS_SMALL
//Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc.
@@ -805,7 +824,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 0
throwforce = 0
item_flags = DROPDEL | ABSTRACT | ISWEAPON
- attack_verb = list("bopped")
+ attack_verb_continuous = list("bops")
+ attack_verb_simple = list("bop")
/obj/item/slapper
name = "slapper"
@@ -815,7 +835,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 0
throwforce = 0
item_flags = DROPDEL | ABSTRACT | ISWEAPON
- attack_verb = list("slapped")
+ attack_verb_continuous = list("slaps")
+ attack_verb_simple = list("slap")
hitsound = 'sound/effects/snap.ogg'
/// How many smaller table smacks we can do before we're out
var/table_smacks_left = 3
@@ -907,7 +928,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 0
throwforce = 0
item_flags = DROPDEL | ABSTRACT | ISWEAPON
- attack_verb = list("is left hanging by")
+ attack_verb_simple = list("is left hanging by")
/obj/item/highfive/attack(mob/target, mob/user)
if(target == user)
@@ -933,7 +954,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
force = 10
throwforce = 5
- attack_verb = list("clubbed", "bludgeoned")
+ attack_verb_continuous = list("clubs", "bludgeons")
+ attack_verb_simple = list("club", "bludgeon")
item_flags = ISWEAPON
var/breakforce = 30
var/stamforce = 15
@@ -987,7 +1009,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
block_flags = BLOCKING_ACTIVE | BLOCKING_NASTY
sharpness = IS_SHARP
bleed_force = BLEED_CUT
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
//HF blade
@@ -1007,7 +1030,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_speed = 4
sharpness = IS_SHARP
bleed_force = BLEED_CUT
- attack_verb = list("cut", "sliced", "diced")
+ attack_verb_continuous = list("cuts", "slices", "dices")
+ attack_verb_simple = list("cut", "slice", "dice")
w_class = WEIGHT_CLASS_BULKY
item_flags = ISWEAPON
slot_flags = ITEM_SLOT_BACK
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 0a4d9d7d8f926..0aef759471a2a 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -159,8 +159,8 @@
/obj/attack_animal(mob/living/simple_animal/M)
if(!M.melee_damage && !M.obj_damage)
- INVOKE_ASYNC(M, TYPE_PROC_REF(/mob, emote), "custom", null, "[M.friendly] [src].")
- return 0
+ M.emote("custom", message = "[M.friendly_verb_continuous] [src].")
+ return FALSE
else
var/play_soundeffect = 1
if(M.environment_smash)
diff --git a/code/game/turfs/turf_integrity.dm b/code/game/turfs/turf_integrity.dm
index ebf76fb3905ad..316ea436512ec 100644
--- a/code/game/turfs/turf_integrity.dm
+++ b/code/game/turfs/turf_integrity.dm
@@ -292,7 +292,7 @@
if (!can_hit)
return ..()
if(!M.melee_damage && !M.obj_damage)
- INVOKE_ASYNC(M, TYPE_PROC_REF(/mob, emote), "custom", null, "[M.friendly] [src].")
+ M.emote("custom", message = "[M.friendly_verb_continuous] [src].")
return 0
else
var/play_soundeffect = 1
diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm
index 6763875819065..83fdcf1d3c19c 100644
--- a/code/modules/antagonists/blob/blob_mobs.dm
+++ b/code/modules/antagonists/blob/blob_mobs.dm
@@ -104,7 +104,8 @@
melee_damage = 4
obj_damage = 20
environment_smash = ENVIRONMENT_SMASH_STRUCTURES
- attacktext = "hits"
+ attack_verb_continuous = "hits"
+ attack_verb_simple = "hit"
attack_sound = 'sound/weapons/genhit1.ogg'
movement_type = FLYING
del_on_death = TRUE
@@ -241,7 +242,8 @@
damage_coeff = list(BRUTE = 0.5, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
melee_damage = 20
obj_damage = 60
- attacktext = "slams"
+ attack_verb_continuous = "slams"
+ attack_verb_simple = "slam"
attack_sound = 'sound/effects/blobattack.ogg'
verb_say = "gurgles"
verb_ask = "demands"
@@ -306,10 +308,10 @@
..()
if(overmind) //if we have an overmind, we're doing chemical reactions instead of pure damage
melee_damage = 4
- attacktext = overmind.blobstrain.blobbernaut_message
+ attack_verb_continuous = overmind.blobstrain.blobbernaut_message
else
melee_damage = initial(melee_damage)
- attacktext = initial(attacktext)
+ attack_verb_continuous = overmind.blobstrain.blobbernaut_message
/mob/living/simple_animal/hostile/blob/blobbernaut/death(gibbed)
..(gibbed)
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index c940b068ef220..39da9eafa0d9c 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -158,7 +158,8 @@
throw_speed = 0
block_flags = BLOCKING_ACTIVE | BLOCKING_NASTY
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
sharpness = IS_SHARP
bleed_force = BLEED_CUT
var/can_drop = FALSE
diff --git a/code/modules/antagonists/changeling/powers/regenerate.dm b/code/modules/antagonists/changeling/powers/regenerate.dm
index 63ea1ce18d084..7987a3761650d 100644
--- a/code/modules/antagonists/changeling/powers/regenerate.dm
+++ b/code/modules/antagonists/changeling/powers/regenerate.dm
@@ -89,10 +89,12 @@
health = 50
maxHealth = 50
melee_damage = 3
- attacktext = "bites"
- response_help = "pokes"
- response_disarm = "shoos"
- response_harm = "steps on"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
+ response_disarm_continuous = "shoos"
+ response_disarm_simple = "shoo"
+ response_harm_continuous = "steps on"
+ response_harm_simple = "step on"
ventcrawler = VENTCRAWLER_ALWAYS
density = FALSE
pass_flags = PASSTABLE | PASSMOB
diff --git a/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm b/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm
index 85d88b5dc51ca..830ecd6b589c6 100644
--- a/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm
+++ b/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm
@@ -17,7 +17,8 @@
armour_penetration = 10
custom_materials = list(/datum/material/iron=1150, /datum/material/gold=2750)
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
+ attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores")
+ attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore")
sharpness = IS_SHARP_ACCURATE
bleed_force = BLEED_CUT
max_integrity = 200
@@ -99,7 +100,8 @@
throwforce = 25
armour_penetration = 6
sharpness = IS_BLUNT
- attack_verb = list("bashed", "smitted", "hammered", "attacked")
+ attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks")
+ attack_verb_simple = list("bash", "bludgeon", "thrash", "whack")
clockwork_hint = "Enemies hit by this will be flung back while on Reebe."
/obj/item/clockwork/weapon/brass_battlehammer/ComponentInitialize()
@@ -122,7 +124,8 @@
force = 26
throwforce = 20
armour_penetration = 12
- attack_verb = list("attacked", "slashed", "cut", "torn", "gored")
+ attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores")
+ attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore")
clockwork_hint = "Targets will be struck with a powerful electromagnetic pulse while on Reebe."
COOLDOWN_DECLARE(emp_cooldown)
diff --git a/code/modules/antagonists/clock_cult/mobs/clockwork_marauder.dm b/code/modules/antagonists/clock_cult/mobs/clockwork_marauder.dm
index a3078affd54aa..3e0490b4b8b51 100644
--- a/code/modules/antagonists/clock_cult/mobs/clockwork_marauder.dm
+++ b/code/modules/antagonists/clock_cult/mobs/clockwork_marauder.dm
@@ -22,7 +22,8 @@ GLOBAL_LIST_EMPTY(clockwork_marauders)
pass_flags = PASSTABLE
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- attacktext = "slices"
+ attack_verb_continuous = "slices"
+ attack_verb_simple = "slice"
attack_sound = 'sound/weapons/bladeslice.ogg'
chat_color = "#CAA25B"
mobchatspan = "brassmobsay"
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index b4e2230551530..6af798845c3a3 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -55,10 +55,9 @@ Striking a noncultist, however, will tear their flesh."}
block_flags = BLOCKING_ACTIVE | BLOCKING_NASTY
throwforce = 10
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "rended")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend")
force = 23
- /// Force dealt to people that have holy protection, including from holding bibles
- var/holy_force = 16
/obj/item/melee/cultblade/Initialize(mapload)
. = ..()
@@ -476,7 +475,8 @@ Striking a noncultist, however, will tear their flesh."}
throw_speed = 2
armour_penetration = 30
block_upgrade_walk = 1
- attack_verb = list("attacked", "impaled", "stabbed", "tore", "gored")
+ attack_verb_continuous = list("attacks", "impales", "stabs", "tears", "lacerates", "gores")
+ attack_verb_simple = list("attack", "impale", "stab", "tear", "lacerate", "gore")
sharpness = IS_SHARP
bleed_force = BLEED_CUT
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -739,7 +739,8 @@ Striking a noncultist, however, will tear their flesh."}
max_integrity = 50
w_class = WEIGHT_CLASS_BULKY
block_flags = BLOCKING_PROJECTILE
- attack_verb = list("bumped", "prodded")
+ attack_verb_continuous = list("bumps", "prods")
+ attack_verb_simple = list("bump", "prod")
hitsound = 'sound/weapons/smash.ogg'
var/illusions = 4
diff --git a/code/modules/antagonists/devil/imp/imp.dm b/code/modules/antagonists/devil/imp/imp.dm
index 0b8f25b0a25c8..a05854b492373 100644
--- a/code/modules/antagonists/devil/imp/imp.dm
+++ b/code/modules/antagonists/devil/imp/imp.dm
@@ -7,9 +7,12 @@
desc = "A large, menacing creature covered in armored black scales."
speak_emote = list("cackles")
emote_hear = list("cackles","screeches")
- response_help = "thinks better of touching"
- response_disarm = "flails at"
- response_harm = "punches"
+ response_help_continuous = "thinks better of touching"
+ response_help_simple = "think better of touching"
+ response_disarm_continuous = "flails at"
+ response_disarm_simple = "flail at"
+ response_harm_continuous = "punches"
+ response_harm_simple = "punch"
icon = 'icons/mob/mob.dmi'
icon_state = "imp"
icon_living = "imp"
@@ -23,7 +26,8 @@
minbodytemp = 250 //Weak to cold
maxbodytemp = INFINITY
faction = list("hell")
- attacktext = "wildly tears into"
+ attack_verb_continuous = "wildly tears into"
+ attack_verb_simple = "wildly tear into"
maxHealth = 200
health = 200
healable = 0
diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm
index 23d8640448406..4a77905073865 100644
--- a/code/modules/antagonists/devil/true_devil/_true_devil.dm
+++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm
@@ -130,8 +130,8 @@
var/weakness = check_weakness(I, user)
apply_damage(I.force * weakness, I.damtype, def_zone)
var/message_verb = ""
- if(I.attack_verb?.len)
- message_verb = "[pick(I.attack_verb)]"
+ if(length(I.attack_verb_continuous))
+ message_verb = "[pick(I.attack_verb_continuous)]"
else if(I.force)
message_verb = "attacked"
diff --git a/code/modules/antagonists/heretic/items/heretic_blades.dm b/code/modules/antagonists/heretic/items/heretic_blades.dm
index 0c908df48b41b..1f3385c65b49d 100644
--- a/code/modules/antagonists/heretic/items/heretic_blades.dm
+++ b/code/modules/antagonists/heretic/items/heretic_blades.dm
@@ -15,7 +15,8 @@
force = 24
throwforce = 10
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend")
var/after_use_message = ""
/obj/item/melee/sickly_blade/attack(mob/living/M, mob/living/user)
diff --git a/code/modules/antagonists/heretic/structures/carving_knife.dm b/code/modules/antagonists/heretic/structures/carving_knife.dm
index 070b1370df972..5977d7504c73d 100644
--- a/code/modules/antagonists/heretic/structures/carving_knife.dm
+++ b/code/modules/antagonists/heretic/structures/carving_knife.dm
@@ -12,7 +12,8 @@
force = 10
throwforce = 20
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
actions_types = list(/datum/action/item_action/rune_shatter)
embedding = list(
ignore_throwspeed_threshold = TRUE,
diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm
index 58683171015e9..a3bb4819619a6 100644
--- a/code/modules/antagonists/morph/morph.dm
+++ b/code/modules/antagonists/morph/morph.dm
@@ -27,7 +27,8 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
vision_range = 1 // Only attack when target is close
wander = FALSE
- attacktext = "glomps"
+ attack_verb_continuous = "glomps"
+ attack_verb_simple = "glomp"
attack_sound = 'sound/effects/blobattack.ogg'
butcher_results = list(/obj/item/food/meat/slab = 2)
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index 696d00bbe2ee1..274648949bfb4 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -28,15 +28,19 @@
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- response_help = "passes through"
- response_disarm = "swings through"
- response_harm = "punches through"
+ response_help_continuous = "passes through"
+ response_help_simple = "pass through"
+ response_disarm_continuous = "swings through"
+ response_disarm_simple = "swing through"
+ response_harm_continuous = "punches through"
+ response_harm_simple = "punch through"
unsuitable_atmos_damage = 0
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) //I don't know how you'd apply those, but revenants no-sell them anyway.
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = INFINITY
- friendly = "touches"
+ friendly_verb_continuous = "touches"
+ friendly_verb_simple = "touch"
status_flags = 0
wander = FALSE
density = FALSE
diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm
index 3536532c69e9d..64733cc76e891 100644
--- a/code/modules/antagonists/slaughter/slaughter.dm
+++ b/code/modules/antagonists/slaughter/slaughter.dm
@@ -6,9 +6,12 @@
desc = "A large, menacing creature covered in armored black scales."
speak_emote = list("gurgles")
emote_hear = list("wails","screeches")
- response_help = "thinks better of touching"
- response_disarm = "flails at"
- response_harm = "punches"
+ response_help_continuous = "thinks better of touching"
+ response_help_simple = "think better of touching"
+ response_disarm_continuous = "flails at"
+ response_disarm_simple = "flail at"
+ response_harm_continuous = "punches"
+ response_harm_simple = "punch"
icon = 'icons/mob/mob.dmi'
icon_state = "daemon"
icon_living = "daemon"
@@ -24,7 +27,8 @@
minbodytemp = 0
maxbodytemp = INFINITY
faction = list("slaughter")
- attacktext = "wildly tears into"
+ attack_verb_continuous = "wildly tears into"
+ attack_verb_simple = "wildly tear into"
maxHealth = 200
health = 200
healable = 0
@@ -118,8 +122,9 @@
desc = "A large, adorable creature covered in armor with pink bows."
speak_emote = list("giggles","titters","chuckles")
emote_hear = list("guffaws","laughs")
- response_help = "hugs"
- attacktext = "wildly tickles"
+ response_help_continuous = "hugs"
+ attack_verb_continuous = "wildly tickles"
+ attack_verb_simple = "wildly tickle"
attack_sound = 'sound/items/bikehorn.ogg'
feast_sound = 'sound/spookoween/scary_horn2.ogg'
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
index 245088e55c1f1..5e4a70d793e83 100644
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ b/code/modules/antagonists/swarmer/swarmer.dm
@@ -76,9 +76,11 @@
hud_possible = list(ANTAG_HUD, DIAG_STAT_HUD, DIAG_HUD)
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
- attacktext = "shocks"
+ attack_verb_continuous = "shocks"
+ attack_verb_simple = "shock"
attack_sound = 'sound/effects/empulse.ogg'
- friendly = "pinches"
+ friendly_verb_continuous = "pinches"
+ friendly_verb_simple = "pinch"
speed = 0
faction = list("swarmer")
AIStatus = AI_OFF
diff --git a/code/modules/awaymissions/mission_code/TheFactory.dm b/code/modules/awaymissions/mission_code/TheFactory.dm
index e7af03ac9ed62..8b8818a34ce4e 100644
--- a/code/modules/awaymissions/mission_code/TheFactory.dm
+++ b/code/modules/awaymissions/mission_code/TheFactory.dm
@@ -240,7 +240,8 @@
search_objects = 1
a_intent = INTENT_HARM
attack_sound = 'sound/weapons/cqchit2.ogg'
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
robust_searching = 1
melee_damage = 12
speed = 0
@@ -253,9 +254,6 @@
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 10
loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
var/cooldown = 0
/mob/living/simple_animal/hostile/factory/death(gibbed)
@@ -356,7 +354,8 @@
maxHealth = 250
melee_damage = 20
rapid_melee = 3
- attacktext = "hits"
+ attack_verb_continuous = "hits"
+ attack_verb_simple = "hit"
attack_sound = 'sound/weapons/genhit3.ogg'
projectilesound = 'sound/weapons/sniper_shot.ogg'
speak_chance = 2
@@ -392,13 +391,11 @@
icon = 'icons/mob/simple_human.dmi'
icon_state = "psycho"
icon_living = "psycho"
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
turns_per_move = 0
del_on_death = TRUE
- response_help = "pokes"
- response_disarm = "touches"
- response_harm = "hits"
speak_chance = 5
attack_sound = 'sound/weapons/bite.ogg'
speak = list("I'm not mad!","What insanity?","Kill")
@@ -459,7 +456,6 @@
/mob/living/simple_animal/hostile/psycho/muzzle
icon_state = "psychomuzzle"
icon_living = "psychomuzzle"
- attacktext = "headbutts"
attack_sound = null
speak_chance = 0
melee_damage = 9
@@ -507,7 +503,6 @@
move_to_delay = 2
melee_damage = 15
attack_sound = null
- attacktext = "headbutts"
loot = list(/obj/effect/mob_spawn/human/corpse/psychost/trap)
var/cooldown = 0
var/static/list/idle_sounds
@@ -567,7 +562,8 @@
speak_chance = 0
speak = null
aggro_vision_range = 9
- attacktext = "hits"
+ attack_verb_continuous = "hits"
+ attack_verb_simple = "hit"
attack_sound = 'sound/weapons/genhit3.ogg'
retreat_distance = 2
melee_queue_distance = 1
diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm
index 5a698b7f13e7a..64796239d48d3 100644
--- a/code/modules/cargo/gondolapod.dm
+++ b/code/modules/cargo/gondolapod.dm
@@ -2,9 +2,12 @@
name = "gondola"
real_name = "gondola"
desc = "The silent walker. This one seems to be part of a delivery agency."
- response_help = "pets"
- response_disarm = "bops"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "bops"
+ response_disarm_simple = "bop"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
faction = list("gondola")
turns_per_move = 10
icon = 'icons/obj/supplypods.dmi'
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 2b2d663dc7bcb..1c81e72e5dffe 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -120,7 +120,8 @@
force = 10
throwforce = 10
throw_speed = 4
- attack_verb = list("sliced")
+ attack_verb_continuous = list("slices")
+ attack_verb_simple = list("slice")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_SURFACE
@@ -221,7 +222,8 @@
force = 10
throwforce = 20
throw_speed = 4
- attack_verb = list("sliced")
+ attack_verb_continuous = list("slices")
+ attack_verb_simple = list("slice")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_SURFACE
@@ -305,7 +307,8 @@
force = 10
throwforce = 10
throw_speed = 4
- attack_verb = list("sliced")
+ attack_verb_continuous = list("slices")
+ attack_verb_simple = list("slice")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_SURFACE
@@ -326,7 +329,8 @@
force = 10
throwforce = 10
throw_speed = 4
- attack_verb = list("sliced")
+ attack_verb_continuous = list("slices")
+ attack_verb_simple = list("slice")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_SURFACE
@@ -538,7 +542,7 @@
clothing_flags = SCAN_REAGENTS | SCAN_BOOZEPOWER
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
resistance_flags = LAVA_PROOF | FIRE_PROOF
- vision_correction = 1 // why should the eye of a god have bad vision?
+ vision_correction = 1 // why should the eye of a god have bad vision?
/obj/item/clothing/glasses/godeye/Initialize(mapload)
. = ..()
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 7750907ad3cdb..25de98ebc0507 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -289,7 +289,8 @@
force = 10
throwforce = 10
throw_speed = 4
- attack_verb = list("sliced")
+ attack_verb_continuous = list("slices")
+ attack_verb_simple = list("slice")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_SURFACE
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
index 445ea0d1d5a68..1dbe7fdaab4e1 100644
--- a/code/modules/clothing/gloves/_gloves.dm
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -9,7 +9,8 @@
siemens_coefficient = 0.5
body_parts_covered = HANDS
slot_flags = ITEM_SLOT_GLOVES
- attack_verb = list("challenged")
+ attack_verb_continuous = list("challenges")
+ attack_verb_simple = list("challenge")
var/transfer_prints = FALSE
strip_delay = 20
equip_delay_other = 40
diff --git a/code/modules/clothing/head/flowercrown.dm b/code/modules/clothing/head/flowercrown.dm
index 347ed86c03e65..aa1d846dd8b72 100644
--- a/code/modules/clothing/head/flowercrown.dm
+++ b/code/modules/clothing/head/flowercrown.dm
@@ -5,7 +5,8 @@
worn_icon = 'icons/mob/clothing/head/hydroponics.dmi'
icon_state = "lily_crown"
dynamic_hair_suffix = ""
- attack_verb = list("crowned")
+ attack_verb_continuous = list("crowns")
+ attack_verb_simple = list("crown")
/obj/item/clothing/head/flowercrown/equipped(mob/user, slot)
. = ..()
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 0ac290f63fdb3..d119d3cb42aca 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -10,7 +10,8 @@
throw_speed = 2
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("warned", "cautioned", "smashed")
+ attack_verb_continuous = list("warns", "cautions", "smashes")
+ attack_verb_simple = list("warn", "caution", "smash")
resistance_flags = NONE
dynamic_hair_suffix = ""
diff --git a/code/modules/clothing/suits/wetfloor.dm b/code/modules/clothing/suits/wetfloor.dm
index 2f281b38ff246..3e06527657ac5 100644
--- a/code/modules/clothing/suits/wetfloor.dm
+++ b/code/modules/clothing/suits/wetfloor.dm
@@ -12,6 +12,7 @@
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|GROIN
- attack_verb = list("warned", "cautioned", "smashed")
+ attack_verb_continuous = list("warns", "cautions", "smashes")
+ attack_verb_simple = list("warn", "caution", "smash")
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 0)
pocket_storage_component_path = null
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index c169b897c6d70..12cead679c170 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -132,7 +132,8 @@
w_class = WEIGHT_CLASS_TINY
item_state = "beer"
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("stabbed", "slashed", "attacked")
+ attack_verb_continuous = list("stabs", "slashes", "attacks")
+ attack_verb_simple = list("stab", "slash", "attack")
sharpness = IS_SHARP
bleed_force = BLEED_SURFACE
var/static/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm
index 9ec4c9776e9fa..8b613e6113f92 100644
--- a/code/modules/holodeck/holo_effect.dm
+++ b/code/modules/holodeck/holo_effect.dm
@@ -50,14 +50,14 @@
deck.card_throwforce = 0
deck.card_throw_speed = 3
deck.card_throw_range = 7
- deck.card_attack_verb = list("attacked")
+ deck.card_attack_verb_continuous = list("attacks")
else
deck.card_hitsound = 'sound/weapons/bladeslice.ogg'
deck.card_force = 5
deck.card_throwforce = 10
deck.card_throw_speed = 3
deck.card_throw_range = 7
- deck.card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
+ deck.card_attack_verb_continuous = list("attacks", "slices", "dices", "slashes", "cuts")
/obj/effect/holodeck_effect/sparks/activate(var/obj/machinery/computer/holodeck/HC)
diff --git a/code/modules/holodeck/mobs.dm b/code/modules/holodeck/mobs.dm
index adac4ea7b2d34..121989bf1e718 100644
--- a/code/modules/holodeck/mobs.dm
+++ b/code/modules/holodeck/mobs.dm
@@ -15,6 +15,9 @@
speak_chance = 1
turns_per_move = 2
butcher_results = list()
- response_help = "pets"
- response_disarm = "pushes aside"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "pushes aside"
+ response_disarm_simple = "push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
diff --git a/code/modules/holoparasite/_holoparasite.dm b/code/modules/holoparasite/_holoparasite.dm
index ab53ae325ae8c..30c7e5f0eb9bf 100644
--- a/code/modules/holoparasite/_holoparasite.dm
+++ b/code/modules/holoparasite/_holoparasite.dm
@@ -8,9 +8,12 @@ GLOBAL_LIST_EMPTY_TYPED(holoparasites, /mob/living/simple_animal/hostile/holopar
gender = NEUTER
mob_biotypes = list(MOB_INORGANIC)
bubble_icon = "guardian"
- response_help = "passes through"
- response_disarm = "flails at"
- response_harm = "punches"
+ response_help_continuous = "passes through"
+ response_help_simple = "pass through"
+ response_disarm_continuous = "flails at"
+ response_disarm_simple = "flail at"
+ response_harm_continuous = "punches"
+ response_harm_simple = "punch"
icon = 'icons/mob/holoparasite.dmi'
icon_state = "magicOrange"
icon_living = "magicOrange"
@@ -27,7 +30,8 @@ GLOBAL_LIST_EMPTY_TYPED(holoparasites, /mob/living/simple_animal/hostile/holopar
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = INFINITY
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
maxHealth = INFINITY // The spirit itself is invincible
health = INFINITY
healable = FALSE // Don't bruise pack the holopara!
diff --git a/code/modules/holoparasite/abilities/weapon/dextrous.dm b/code/modules/holoparasite/abilities/weapon/dextrous.dm
index 22224dbb061f4..c13dfab9ea0eb 100644
--- a/code/modules/holoparasite/abilities/weapon/dextrous.dm
+++ b/code/modules/holoparasite/abilities/weapon/dextrous.dm
@@ -107,8 +107,10 @@
owner.ranged = FALSE
if(isnull(owner.theme.mob_info[HOLOPARA_THEME_ATTACK_SOUND]))
owner.attack_sound = "punch"
- owner.response_harm = "weakly punches"
- owner.attacktext = "weakly punches"
+ owner.response_harm_continuous = "weakly punches"
+ owner.response_harm_simple = "weakly punch"
+ owner.attack_verb_continuous = "weakly punches"
+ owner.attack_verb_simple = "weakly punch"
owner.environment_smash = NONE
. = ..()
@@ -125,8 +127,10 @@
owner.ranged = initial(owner.ranged)
if(isnull(owner.theme.mob_info[HOLOPARA_THEME_ATTACK_SOUND]))
owner.attack_sound = initial(owner.attack_sound)
- owner.response_harm = initial(owner.response_harm)
- owner.attacktext = initial(owner.attacktext)
+ owner.response_harm_continuous = initial(owner.response_harm_continuous)
+ owner.response_harm_simple = initial(owner.response_harm_simple)
+ owner.attack_verb_continuous = initial(owner.attack_verb_continuous)
+ owner.attack_verb_simple = initial(owner.attack_verb_simple)
owner.environment_smash = initial(owner.environment_smash)
. = ..()
diff --git a/code/modules/holoparasite/abilities/weapon/projectile.dm b/code/modules/holoparasite/abilities/weapon/projectile.dm
index ba7248ed639d8..efec69a231a3e 100644
--- a/code/modules/holoparasite/abilities/weapon/projectile.dm
+++ b/code/modules/holoparasite/abilities/weapon/projectile.dm
@@ -20,8 +20,10 @@
owner.ranged_cooldown_time = 17.5 / master_stats.speed
owner.melee_damage = 6 + round((master_stats.damage - 1) * 0.8) // barely stronger than a normal human punch
owner.obj_damage = 6 + round((master_stats.damage - 1) * 0.8)
- owner.response_harm = "weakly punches"
- owner.attacktext = "weakly punches"
+ owner.response_harm_continuous = "weakly punches"
+ owner.response_harm_simple = "weakly punch"
+ owner.attack_verb_continuous = "weakly punches"
+ owner.attack_verb_simple = "weakly punch"
/datum/holoparasite_ability/weapon/ranged/remove()
. = ..()
@@ -29,5 +31,7 @@
owner.ranged_cooldown_time = initial(owner.ranged_cooldown_time)
owner.melee_damage = initial(owner.melee_damage)
owner.obj_damage = initial(owner.obj_damage)
- owner.response_harm = initial(owner.response_harm)
- owner.attacktext = initial(owner.attacktext)
+ owner.response_harm_continuous = initial(owner.response_harm_continuous)
+ owner.response_harm_simple = initial(owner.response_harm_simple)
+ owner.attack_verb_continuous = initial(owner.attack_verb_continuous)
+ owner.attack_verb_simple = initial(owner.attack_verb_simple)
diff --git a/code/modules/holoparasite/abilities/weapon/stab.dm b/code/modules/holoparasite/abilities/weapon/stab.dm
index a6cffc338f284..957c24aad437e 100644
--- a/code/modules/holoparasite/abilities/weapon/stab.dm
+++ b/code/modules/holoparasite/abilities/weapon/stab.dm
@@ -25,8 +25,10 @@
owner.armour_penetration = max(master_stats.potential - 1, 0) * 15
if(isnull(owner.theme.mob_info[HOLOPARA_THEME_ATTACK_SOUND]))
owner.attack_sound = 'sound/weapons/bladeslice.ogg'
- owner.response_harm = "stabs"
- owner.attacktext = "stabs"
+ owner.response_harm_continuous = "stabs"
+ owner.response_harm_simple = "stab"
+ owner.attack_verb_continuous = "stabs"
+ owner.attack_verb_simple = "stab"
bleed_level = (master_stats.damage / 5) * (BLEED_DEEP_WOUND - BLEED_SURFACE) + BLEED_SURFACE
/datum/holoparasite_ability/weapon/blade/remove()
@@ -36,8 +38,10 @@
owner.armour_penetration = initial(owner.armour_penetration)
if(isnull(owner.theme.mob_info[HOLOPARA_THEME_ATTACK_SOUND]))
owner.attack_sound = initial(owner.attack_sound)
- owner.response_harm = initial(owner.response_harm)
- owner.attacktext = initial(owner.attacktext)
+ owner.response_harm_continuous = initial(owner.response_harm_continuous)
+ owner.response_harm_simple = initial(owner.response_harm_simple)
+ owner.attack_verb_continuous = initial(owner.attack_verb_continuous)
+ owner.attack_verb_simple = initial(owner.attack_verb_simple)
/datum/holoparasite_ability/weapon/blade/attack_effect(atom/movable/target, successful)
. = ..()
diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm
index 07cfee24cab52..624c4290225d1 100644
--- a/code/modules/hydroponics/grown/cotton.dm
+++ b/code/modules/hydroponics/grown/cotton.dm
@@ -27,7 +27,8 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 2
throw_range = 3
- attack_verb = list("pomfed")
+ attack_verb_continuous = list("pomfs")
+ attack_verb_simple = list("pomf")
var/cotton_type = /obj/item/stack/sheet/cotton
var/cotton_name = "raw cotton"
@@ -74,7 +75,8 @@
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 2
throw_range = 3
- attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
+ attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks")
+ attack_verb_simple = list("bash", "batter", "bludgeon", "whack")
cotton_type = /obj/item/stack/sheet/cotton/durathread
cotton_name = "raw durathread"
discovery_points = 300
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index f5ac141a8a77b..18f58db509e2d 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -280,7 +280,8 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
- attack_verb = list("roasted", "scorched", "burned")
+ attack_verb_continuous = list("roasts", "scorches", "burns")
+ attack_verb_simple = list("roast", "scorch", "burn")
grind_results = list(/datum/reagent/consumable/capsaicin = 0, /datum/reagent/consumable/condensedcapsaicin = 0)
discovery_points = 300
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index c02e39bd26ca7..480f95742a172 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -44,7 +44,8 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
- attack_verb = list("stung")
+ attack_verb_continuous = list("stings")
+ attack_verb_simple = list("sting")
/obj/item/food/grown/nettle/suicide_act(mob/user)
user.visible_message("[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide!")
diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm
index 463282323ba2b..0427b3196f938 100644
--- a/code/modules/hydroponics/grown/pineapple.dm
+++ b/code/modules/hydroponics/grown/pineapple.dm
@@ -23,7 +23,8 @@
force = 4
throwforce = 8
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("stung", "pined")
+ attack_verb_continuous = list("stings", "pines")
+ attack_verb_simple = list("sting", "pine")
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/hydroponics/grown/rainbow_bunch.dm b/code/modules/hydroponics/grown/rainbow_bunch.dm
index 877ba1891791b..99ef95a9b961d 100644
--- a/code/modules/hydroponics/grown/rainbow_bunch.dm
+++ b/code/modules/hydroponics/grown/rainbow_bunch.dm
@@ -28,7 +28,8 @@
throw_range = 3
bite_consumption_mod = 0
foodtypes = null
- attack_verb = list("pompfed")
+ attack_verb_continuous = list("pompfs")
+ attack_verb_simple = list("pompf")
/obj/item/food/grown/flower/rainbow/Initialize(mapload)
. = ..()
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index 694593f8e28f7..4f885592a0b24 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -42,7 +42,8 @@
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 2
throw_range = 3
- attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
+ attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks")
+ attack_verb_simple = list("bash", "batter", "bludgeon", "whack")
var/plank_type = /obj/item/stack/sheet/wood
var/plank_name = "wooden planks"
var/static/list/accepted = typecacheof(list(/obj/item/food/grown/tobacco,
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index feb342f3196fc..e23f4ed6ee784 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -60,7 +60,8 @@
throwforce = 7
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=50)
- attack_verb = list("slashed", "sliced", "cut", "clawed")
+ attack_verb_continuous = list("slashes", "slices", "cuts", "claws")
+ attack_verb_simple = list("slash", "slice", "cut", "claw")
hitsound = 'sound/weapons/bladeslice.ogg'
/obj/item/cultivator/suicide_act(mob/living/user)
@@ -83,7 +84,8 @@
throw_speed = 3
throw_range = 4
custom_materials = list(/datum/material/iron = 15000)
- attack_verb = list("chopped", "tore", "cut")
+ attack_verb_continuous = list("chops", "tears", "lacerates", "cuts")
+ attack_verb_simple = list("chop", "tear", "lacerate", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
bleed_force = BLEED_CUT
@@ -112,7 +114,8 @@
flags_1 = CONDUCT_1
armour_penetration = 20
slot_flags = ITEM_SLOT_BACK
- attack_verb = list("chopped", "sliced", "cut", "reaped")
+ attack_verb_continuous = list("chops", "slices", "cuts", "reaps")
+ attack_verb_simple = list("chop", "slice", "cut", "reap")
hitsound = 'sound/weapons/bladeslice.ogg'
var/swiping = FALSE
diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm
index a0bcec6999935..308c55f277b5d 100644
--- a/code/modules/instruments/items.dm
+++ b/code/modules/instruments/items.dm
@@ -78,7 +78,8 @@
desc = "A 'Mura' brand banjo. It's pretty much just a drum with a neck and strings."
icon_state = "banjo"
item_state = "banjo"
- attack_verb = list("scruggs-styled", "hum-diggitied", "shin-digged", "clawhammered")
+ attack_verb_continuous = list("scruggs-styles", "hum-diggitys", "shin-digs", "clawhammers")
+ attack_verb_simple = list("scruggs-style", "hum-diggity", "shin-dig", "clawhammer")
hitsound = 'sound/weapons/banjoslap.ogg'
allowed_instrument_ids = "banjo"
@@ -87,7 +88,8 @@
desc = "It's made of wood and has bronze strings."
icon_state = "guitar"
item_state = "guitar"
- attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
+ attack_verb_continuous = list("plays metal on", "serenades", "crashes", "smashes")
+ attack_verb_simple = list("play metal on", "serenade", "crash", "smash")
hitsound = 'sound/weapons/stringsmash.ogg'
allowed_instrument_ids = list("guitar","csteelgt","cnylongt", "ccleangt", "cmutedgt")
@@ -97,7 +99,8 @@
icon_state = "eguitar"
item_state = "eguitar"
force = 12
- attack_verb = list("played metal on", "shredded", "crashed", "smashed")
+ attack_verb_continuous = list("plays metal on", "shreds", "crashes", "smashes")
+ attack_verb_simple = list("play metal on", "shred", "crash", "smash")
hitsound = 'sound/weapons/stringsmash.ogg'
allowed_instrument_ids = "eguitar"
@@ -128,7 +131,8 @@
icon_state = "trumpet"
item_state = "trombone"
force = 0
- attack_verb = list("played","jazzed","trumpeted","mourned","dooted","spooked")
+ attack_verb_continuous = list("plays", "jazzes", "trumpets", "mourns", "doots", "spooks")
+ attack_verb_simple = list("play", "jazz", "trumpet", "mourn", "doot", "spook")
/obj/item/instrument/trumpet/spectral/Initialize(mapload)
. = ..()
@@ -152,7 +156,8 @@
item_state = "saxophone"
allowed_instrument_ids = "saxophone"
force = 0
- attack_verb = list("played","jazzed","saxxed","mourned","dooted","spooked")
+ attack_verb_continuous = list("plays", "jazzes", "saxxes", "mourns", "doots", "spooks")
+ attack_verb_simple = list("play", "jazz", "sax", "mourn", "doot", "spook")
/obj/item/instrument/saxophone/spectral/Initialize(mapload)
. = ..()
@@ -175,7 +180,8 @@
icon_state = "trombone"
item_state = "trombone"
force = 0
- attack_verb = list("played","jazzed","tromboned","mourned","dooted","spooked")
+ attack_verb_continuous = list("plays", "jazzes", "trombones", "mourns", "doots", "spooks")
+ attack_verb_simple = list("play", "jazz", "trombone", "mourn", "doot", "spook")
/obj/item/instrument/trombone/spectral/Initialize(mapload)
. = ..()
@@ -226,7 +232,8 @@
item_state = "bike_horn"
lefthand_file = 'icons/mob/inhands/equipment/horns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/horns_righthand.dmi'
- attack_verb = list("beautifully honks")
+ attack_verb_continuous = list("beautifully honks")
+ attack_verb_simple = list("beautifully honk")
allowed_instrument_ids = list("bikehorn", "honk")
w_class = WEIGHT_CLASS_TINY
force = 0
@@ -293,7 +300,8 @@
desc = "Despite its popularity, this controversial musical toy was eventually banned due to its unethically sampled sounds of moths screaming in agony."
icon_state = "mothsician"
allowed_instrument_ids = "mothscream"
- attack_verb = list("flutter", "flap")
+ attack_verb_continuous = list("flutters", "flaps")
+ attack_verb_simple = list("flutter", "flap")
w_class = WEIGHT_CLASS_TINY
force = 0
hitsound = 'sound/voice/moth/scream_moth.ogg'
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index a583a00d3c955..3ed4731b5b846 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -224,7 +224,8 @@
item_flags = ISWEAPON
drop_sound = 'sound/items/handling/book_drop.ogg'
pickup_sound = 'sound/items/handling/book_pickup.ogg'
- attack_verb = list("bashed", "whacked", "educated")
+ attack_verb_continuous = list("bashes", "whacks", "educates")
+ attack_verb_simple = list("bash", "whack", "educate")
resistance_flags = FLAMMABLE
var/dat //Actual page content
var/due_date = 0 //Game time in 1/10th seconds
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index bb1140c266ffe..7199aa1e6b220 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -16,7 +16,8 @@
armour_penetration = 10
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("smashed", "crushed", "cleaved", "chopped", "pulped")
+ attack_verb_continuous = list("smashes", "crushes", "cleaves", "chops", "pulps")
+ attack_verb_simple = list("smash", "crush", "cleave", "chop", "pulp")
sharpness = IS_SHARP
bleed_force = BLEED_CUT
actions_types = list(/datum/action/item_action/toggle_light)
diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
index 4edef3cd9e48e..9169da8fd5fba 100644
--- a/code/modules/mining/equipment/mining_tools.dm
+++ b/code/modules/mining/equipment/mining_tools.dm
@@ -16,7 +16,8 @@
tool_behaviour = TOOL_MINING
toolspeed = 1
usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
- attack_verb = list("hit", "pierced", "sliced", "attacked")
+ attack_verb_continuous = list("hits", "pierces", "slices", "attacks")
+ attack_verb_simple = list("hit", "pierce", "slice", "attack")
/obj/item/pickaxe/suicide_act(mob/living/user)
user.visible_message("[user] begins digging into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -112,7 +113,8 @@
throwforce = 4
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=50)
- attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
+ attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks")
+ attack_verb_simple = list("bash", "batter", "bludgeon", "whack")
sharpness = IS_SHARP
/obj/item/shovel/Initialize(mapload)
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 8dfa2dd608204..936e5c2db5ef3 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -705,8 +705,8 @@
icon_state_on = "cleaving_saw_open"
worn_icon_state = "cleaving_saw"
slot_flags = ITEM_SLOT_BELT
- attack_verb_off = list("attacked", "sawed", "sliced", "tore", "ripped", "diced", "cut")
- attack_verb_on = list("cleaved", "swiped", "slashed", "chopped")
+ attack_verb_off = list("attacks", "saws", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_on = list("cleaves", "swipes", "slashes", "chops")
hitsound = 'sound/weapons/bladeslice.ogg'
hitsound_on = 'sound/weapons/bladeslice.ogg'
w_class = WEIGHT_CLASS_BULKY
@@ -814,7 +814,8 @@
block_power = 20
block_flags = BLOCKING_ACTIVE | BLOCKING_NASTY
hitsound = 'sound/effects/ghost2.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "rended")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend")
var/summon_cooldown = 0
var/list/mob/dead/observer/spirits
@@ -1113,7 +1114,8 @@
slot_flags = ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
force = 5 //Melee attacks also invoke a 15 burn damage AoE, for a total of 20 damage
- attack_verb = list("clubbed", "beat", "pummeled")
+ attack_verb_continuous = list("clubs", "beats", "pummels")
+ attack_verb_simple = list("club", "beat", "pummel")
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
actions_types = list(/datum/action/item_action/vortex_recall, /datum/action/item_action/toggle_unfriendly_fire)
var/power = 15 //Damage of the magic tiles
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index a6a7b9d1098f3..e03a81faa1ce8 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -39,8 +39,10 @@
/obj/item/stack/ore/plasma, /obj/item/stack/ore/uranium, /obj/item/stack/ore/iron,
/obj/item/stack/ore/bananium, /obj/item/stack/ore/titanium)
// Response verbs
- response_help = "pets"
- attacktext = "drills"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ attack_verb_continuous = "drills"
+ attack_verb_simple = "drill"
attack_sound = 'sound/weapons/circsawhit.ogg'
speak_emote = list("states")
// Light handling
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 65ab71b9b94fb..4379df50c3d95 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -8,7 +8,8 @@
zone = BODY_ZONE_HEAD
slot = ORGAN_SLOT_BRAIN
organ_flags = ORGAN_VITAL|ORGAN_EDIBLE
- attack_verb = list("attacked", "slapped", "whacked")
+ attack_verb_continuous = list("attacks", "slaps", "whacks")
+ attack_verb_simple = list("attack", "slap", "whack")
///The brain's organ variables are significantly more different than the other organs, with half the decay rate for balance reasons, and twice the maxHealth
decay_factor = STANDARD_ORGAN_DECAY / 2 //30 minutes of decaying to result in a fully damaged brain, since a fast decay rate would be unfun gameplay-wise
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index 1327acbc9b2e4..383f9afec9951 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -39,6 +39,7 @@ In all, this is a lot like the monkey code. /N
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
visible_message("[M.name] playfully bites [src]!", \
"[M.name] playfully bites you!", null, COMBAT_MESSAGE_RANGE)
+ to_chat(M, "You playfully bite [src]!")
adjustBruteLoss(1)
log_combat(M, src, "attacked", M)
updatehealth()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
index 187fe81bf6665..32abe5ebc7686 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
@@ -2,15 +2,16 @@
if(user.a_intent == INTENT_HARM)
..(user, 1)
adjustBruteLoss(15)
- var/hitverb = "punches"
+ var/hitverb = "hit"
if(mob_size < MOB_SIZE_LARGE)
step_away(src,user,15)
sleep(1)
step_away(src,user,15)
- hitverb = "slams"
+ hitverb = "slam"
playsound(loc, "punch", 25, 1, -1)
- visible_message("[user] [hitverb] [src]!", \
- "[user] [hitverb] you!", null, COMBAT_MESSAGE_RANGE)
+ visible_message("[user] [hitverb]s [src]!", \
+ "[user] [hitverb]s you!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, "You [hitverb] [src]!")
return TRUE
/mob/living/carbon/alien/humanoid/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
diff --git a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
index a92f211318191..fa0fe464132e8 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
@@ -5,7 +5,8 @@
playsound(loc, "punch", 25, 1, -1)
log_combat(M, src, "attacked", M)
visible_message("[M] kicks [src]!", \
- "[M] kicks you!", null, COMBAT_MESSAGE_RANGE)
+ "[M] kicks you!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You kick [src]!")
var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.get_combat_bodyzone(src)))
apply_damage(M.dna.species.punchdamage, BRUTE, affecting)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 5608aa1cbd5d0..04b250a5a5f42 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -116,6 +116,43 @@
playsound(get_turf(src), I.get_dismember_sound(), 80, 1)
return TRUE //successful attack
+/mob/living/carbon/send_item_attack_message(obj/item/I, mob/living/user, hit_area, obj/item/bodypart/hit_bodypart)
+ if(!I.force && !length(I.attack_verb_simple) && !length(I.attack_verb_continuous))
+ return
+ var/message_verb_continuous = length(I.attack_verb_continuous) ? "[pick(I.attack_verb_continuous)]" : "attacks"
+ var/message_verb_simple = length(I.attack_verb_simple) ? "[pick(I.attack_verb_simple)]" : "attack"
+
+ 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_spectator = "[src] [message_verb_continuous][message_hit_area] with [I][extra_wound_details]!"
+ var/attack_message_victim = "You're [message_verb_continuous][message_hit_area] with [I][extra_wound_details]!"
+ var/attack_message_attacker = "You [message_verb_simple] [src][message_hit_area] with [I]!"
+ if(user in viewers(src, null))
+ attack_message_spectator = "[user] [message_verb_continuous] [src][message_hit_area] with [I][extra_wound_details]!"
+ attack_message_victim = "[user] [message_verb_continuous] you[message_hit_area] with [I][extra_wound_details]!"
+ if(user == src)
+ attack_message_victim = "You [message_verb_simple] yourself[message_hit_area] with [I][extra_wound_details]!"
+ visible_message("[attack_message_spectator]",\
+ "[attack_message_victim]", null, COMBAT_MESSAGE_RANGE, user)
+ if(user != src)
+ to_chat(user, "[attack_message_attacker]")
+ return TRUE
+
+
/mob/living/carbon/attack_drone(mob/living/simple_animal/drone/user)
return //so we don't call the carbon's attack_hand().
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index fc2801bf06906..701172cac1662 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -202,10 +202,10 @@
if(check_shields(user, 15, "the [hulk_verb]ing"))
return
..(user, 1)
- playsound(loc, user.dna.species.attack_sound, 25, 1, -1)
- var/message = "[user] has [hulk_verb]ed [src]!"
- visible_message("[message]", \
- "[message]")
+ playsound(loc, user.dna.species.attack_sound, 25, TRUE, -1)
+ visible_message("[user] [hulk_verb]ed [src]!", \
+ "[user] [hulk_verb]ed [src]!", "You hear a sickening sound of flesh hitting flesh!", null, user)
+ to_chat(user, "You [hulk_verb] [src]!")
var/obj/item/bodypart/affecting = get_bodypart(ran_zone(user.get_combat_bodyzone(src)))
if(!affecting)
affecting = get_bodypart(BODY_ZONE_CHEST)
@@ -223,7 +223,8 @@
/mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M)
if(check_shields(M, 0, "the [M.name]", UNARMED_ATTACK))
visible_message("[M] attempts to touch [src]!", \
- "[M] attempts to touch you!")
+ "[M] attempts to touch you!", "You hear a swoosh!", null, M)
+ to_chat(M, "You attempt to touch [src]!")
return 0
var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
@@ -250,7 +251,8 @@
/mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M)
if(check_shields(M, 20, "the [M.name]", UNARMED_ATTACK))
visible_message("[M] attempts to touch [src]!", \
- "[M] attempts to touch you!")
+ "[M] attempts to touch you!", "You hear a swoosh!", null, M)
+ to_chat(M, "You attempt to touch [src]!")
return 0
if(..())
@@ -264,7 +266,8 @@
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
visible_message("[M] slashes at [src]!", \
- "[M] slashes at you!")
+ "[M] slashes at you!", "You hear a sickening sound of a slice!", null, M)
+ to_chat(M, "You slash at [src]!")
log_combat(M, src, "attacked", M)
if(!dismembering_strike(M, M.get_combat_bodyzone(src))) //Dismemberment successful
return 1
@@ -280,7 +283,8 @@
var/armor_block = run_armor_check(affecting, MELEE,"","",10)
apply_damage(30, STAMINA, affecting, armor_block)
visible_message("[M] tackles [src] down!", \
- "[M] tackles you down!")
+ "[M] tackles you down!", "You hear aggressive shuffling followed by a loud thud!", null, M)
+ to_chat(M, "You tackle [src] down!")
/mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index e06f1c0f80e33..8874bad02caff 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1579,8 +1579,9 @@ GLOBAL_LIST_EMPTY(features_by_species)
/datum/species/proc/grab(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
if(target.check_block())
- target.visible_message("[target] blocks [user]'s grab attempt!", \
- "You block [user]'s grab attempt!")
+ target.visible_message("[target] blocks [user]'s grab!", \
+ "You block [user]'s grab!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, "Your grab at [target] was blocked!")
return FALSE
if(attacker_style && attacker_style.grab_act(user,target))
return TRUE
@@ -1590,14 +1591,16 @@ GLOBAL_LIST_EMPTY(features_by_species)
if(HAS_TRAIT(target.shoes, TRAIT_NODROP))
target.grabbedby(user)
return TRUE
- user.visible_message("[user] starts stealing [target]'s shoes!",
- "You start stealing [target]'s shoes!")
var/obj/item/I = target.shoes
+ user.visible_message("[user] starts stealing [target]'s [I.name]!",
+ "You start stealing [target]'s [I.name]...", null, null, target)
+ to_chat(target, "[user] starts stealing your [I.name]!")
if(do_after(user, I.strip_delay, target))
target.dropItemToGround(I, TRUE)
user.put_in_hands(I)
- user.visible_message("[user] stole your [I]!",
- "You steal [target]'s [I]!")
+ user.visible_message("[user] stole [target]'s [I.name]!",
+ "You stole [target]'s [I.name]!", null, null, target)
+ to_chat(target, "[user] stole your [I.name]!")
target.grabbedby(user)
return TRUE
@@ -1607,7 +1610,8 @@ GLOBAL_LIST_EMPTY(features_by_species)
return FALSE
if(target.check_block())
target.visible_message("[target] blocks [user]'s attack!", \
- "You block [user]'s attack!")
+ "You block [user]'s attack!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, "Your attack at [target] was blocked!")
return FALSE
if(attacker_style && attacker_style.harm_act(user,target))
return TRUE
@@ -1633,8 +1637,9 @@ GLOBAL_LIST_EMPTY(features_by_species)
if(!damage || !affecting)//future-proofing for species that have 0 damage/weird cases where no zone is targeted
playsound(target.loc, user.dna.species.miss_sound, 25, 1, -1)
- target.visible_message("[user]'s [atk_verb] misses [target]!",\
- "[user]'s [atk_verb] misses you!", null, COMBAT_MESSAGE_RANGE)
+ target.visible_message("[user]'s [atk_verb] misses [target]!", \
+ "You avoid [user]'s [atk_verb]!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, "Your [atk_verb] misses [target]!")
log_combat(user, target, "attempted to punch")
return FALSE
@@ -1643,7 +1648,8 @@ GLOBAL_LIST_EMPTY(features_by_species)
playsound(target.loc, user.dna.species.attack_sound, 25, 1, -1)
target.visible_message("[user] [atk_verb]ed [target]!", \
- "[user] [atk_verb]ed you!", null, COMBAT_MESSAGE_RANGE)
+ "You're [atk_verb]ed by [user]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, "You [atk_verb] [target]!")
target.lastattacker = user.real_name
target.lastattackerckey = user.ckey
@@ -1669,8 +1675,9 @@ GLOBAL_LIST_EMPTY(features_by_species)
/datum/species/proc/disarm(mob/living/carbon/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
if(target.check_block())
- target.visible_message("[target] blocks [user]'s shoving attempt!", \
- "You block [user]'s shoving attempt!")
+ target.visible_message("[user]'s shove is blocked by [target]!", \
+ "You block [user]'s shove!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, "Your shove at [target] was blocked!")
return FALSE
if(attacker_style && attacker_style.disarm_act(user,target))
return TRUE
@@ -1699,7 +1706,8 @@ GLOBAL_LIST_EMPTY(features_by_species)
if((M != H) && M.a_intent != INTENT_HELP && H.check_shields(M, 0, M.name, attack_type = UNARMED_ATTACK))
log_combat(M, H, "attempted to touch")
H.visible_message("[M] attempts to touch [H]!", \
- "[M] attempts to touch you!")
+ "[M] attempts to touch you!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You attempt to touch [H]!")
return 0
SEND_SIGNAL(M, COMSIG_MOB_ATTACK_HAND, M, H, attacker_style)
SEND_SIGNAL(H, COMSIG_MOB_HAND_ATTACKED, H, M, attacker_style)
diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
index 33346b7eea42a..7355cac739930 100644
--- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
@@ -39,7 +39,8 @@
if("harm")
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
visible_message("[M] punches [name]!", \
- "[M] punches you!", null, COMBAT_MESSAGE_RANGE)
+ "[M] punches you!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You punch [name]!")
playsound(loc, "punch", 25, 1, -1)
var/damage = M.dna.species.punchdamage
var/obj/item/bodypart/affecting = get_bodypart(check_zone(M.get_combat_bodyzone(src)))
@@ -62,10 +63,12 @@
if(AmountUnconscious() < 300)
Unconscious(rand(200, 300))
visible_message("[M] wounds [name]!", \
- "[M] wounds you!", null, COMBAT_MESSAGE_RANGE)
+ "[M] wounds you!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You wound [name]!")
else
visible_message("[M] slashes [name]!", \
- "[M] slashes you!", null, COMBAT_MESSAGE_RANGE)
+ "[M] slashes you!", "You hear a sickening sound of a slice!", COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You slash [name]!")
var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.get_combat_bodyzone(src)))
log_combat(M, src, "attacked", M)
@@ -78,7 +81,8 @@
else
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
visible_message("[M]'s lunge misses [name]!", \
- "[M]'s lunge misses you!", null, COMBAT_MESSAGE_RANGE)
+ "You avoid [M]'s lunge!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "Your lunge misses [name]!")
if (M.a_intent == INTENT_DISARM)
var/obj/item/I = null
@@ -86,12 +90,14 @@
if(prob(95))
Paralyze(20)
visible_message("[M] tackles [name] down!", \
- "[M] tackles you down!", null, COMBAT_MESSAGE_RANGE)
+ "[M] tackles you down!", "You hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You tackle [name] down!")
else
I = get_active_held_item()
if(dropItemToGround(I))
visible_message("[M] disarms [name]!", \
- "[M] disarms you!", null, COMBAT_MESSAGE_RANGE)
+ "[M] disarms you!", "You hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You disarm [name]!")
else
I = null
log_combat(M, src, "disarmed", null, "[I ? " removing \the [I]" : ""]", important = FALSE)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 8400d117fdaa7..caf4b857864ca 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -288,7 +288,9 @@
if(AM.pulledby)
if(!supress_message)
- visible_message("[src] has pulled [AM] from [AM.pulledby]'s grip.")
+ AM.visible_message("[src] has pulled [AM] from [AM.pulledby]'s grip.", \
+ "[src] has pulled you from [AM.pulledby]'s grip.", null, null, src)
+ to_chat(src, "You pull [AM] from [AM.pulledby]'s grip!")
log_combat(AM, AM.pulledby, "pulled from", src, important = FALSE)
AM.pulledby.stop_pulling() //an object can't be pulled by two mobs at once.
@@ -902,12 +904,16 @@
var/resist_chance = BASE_GRAB_RESIST_CHANCE // see defines/combat.dm
resist_chance = max(resist_chance/altered_grab_state-sqrt((getStaminaLoss()+getBruteLoss()/2)*(3-altered_grab_state)), 0) // https://i.imgur.com/6yAT90T.png for sample output values
if(prob(resist_chance))
- visible_message("[src] has broken free of [pulledby]'s grip!")
+ visible_message("[src] breaks free of [pulledby]'s grip!", \
+ "You break free of [pulledby]'s grip!", null, null, pulledby)
+ to_chat(pulledby, "[src] breaks free of your grip!")
log_combat(pulledby, src, "broke grab")
pulledby.stop_pulling()
return FALSE
else
- visible_message("[src] struggles as they fail to break free of [pulledby]'s grip!")
+ visible_message("[src] struggles as they fail to break free of [pulledby]'s grip!", \
+ "You struggle as you fail to break free of [pulledby]'s grip!", null, null, pulledby)
+ to_chat(pulledby, "[src] struggles as they fail to break free of your grip!")
if(moving_resist && client) //we resisted by trying to move
client.move_delay = world.time + 2 SECONDS
else
@@ -963,8 +969,9 @@
if(!what.canStrip(who))
to_chat(src, "You can't remove [what.name], it appears to be stuck!")
return
- who.visible_message("[src] tries to remove [who]'s [what.name].", \
- "[src] tries to remove your [what.name].")
+ who.visible_message("[src] tries to remove [who]'s [what.name].", \
+ "[src] tries to remove your [what.name].", null, null, src)
+ to_chat(src, "You try to remove [who]'s [what.name]...")
what.add_fingerprint(src)
if(do_after(src, what.strip_delay, who))
if(what && Adjacent(who))
@@ -999,7 +1006,8 @@
return
who.visible_message("[src] tries to put [what] on [who].", \
- "[src] tries to put [what] on you.")
+ "[src] tries to put [what] on you.", null, null, src)
+ to_chat(src, "You try to put [what] on [who]...")
if(do_after(src, what.equip_delay_other, who))
if(what && Adjacent(who) && what.mob_can_equip(who, src, final_where, TRUE, TRUE))
if(temporarilyRemoveItemFromInventory(what))
@@ -1447,7 +1455,9 @@
if(buckled)
to_chat(user, "[src] is buckled to something!")
return FALSE
- user.visible_message("[user] starts trying to scoop up [src]!")
+ user.visible_message("[user] starts trying to scoop up [src]!", \
+ "You start trying to scoop up [src]...", null, null, src)
+ to_chat(src, "[user] starts trying to scoop you up!")
if(!do_after(user, 20, target = src))
return FALSE
mob_pickup(user)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 1cf6ee18abf98..a34ecf210817b 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -158,52 +158,57 @@
var/mob/living/carbon/human/H = user
if(H.dna.species.grab_sound)
sound_to_play = H.dna.species.grab_sound
- playsound(src.loc, sound_to_play, 50, 1, -1)
+ playsound(src.loc, sound_to_play, 50, TRUE, -1)
if(user.grab_state) //only the first upgrade is instantaneous
var/old_grab_state = user.grab_state
var/grab_upgrade_time = instant ? 0 : 30
visible_message("[user] starts to tighten [user.p_their()] grip on [src]!", \
- "[user] starts to tighten [user.p_their()] grip on you!")
+ "[user] starts to tighten [user.p_their()] grip on you!", "You hear aggressive shuffling!", null, user)
+ to_chat(user, "You start to tighten your grip on [src]!")
switch(user.grab_state)
if(GRAB_AGGRESSIVE)
log_combat(user, src, "attempted to neck grab", addition="neck grab")
if(GRAB_NECK)
log_combat(user, src, "attempted to strangle", addition="kill grab")
if(!do_after(user, grab_upgrade_time, src))
- return 0
+ return FALSE
if(!user.pulling || user.pulling != src || user.grab_state != old_grab_state)
- return 0
+ return FALSE
if(user.a_intent != INTENT_GRAB)
to_chat(user, "You must be on grab intent to upgrade your grab further!")
- return 0
+ return FALSE
user.setGrabState(user.grab_state + 1)
switch(user.grab_state)
if(GRAB_AGGRESSIVE)
var/add_log = ""
if(HAS_TRAIT(user, TRAIT_PACIFISM))
visible_message("[user] firmly grips [src]!",
- "[user] firmly grips you!")
+ "[user] firmly grips you!", "You hear aggressive shuffling!", null, user)
+ to_chat(user, "You firmly grip [src]!")
add_log = " (pacifist)"
else
visible_message("[user] grabs [src] aggressively!", \
- "[user] grabs you aggressively!")
+ "[user] grabs you aggressively!", "You hear aggressive shuffling!", null, user)
+ to_chat(user, "You grab [src] aggressively!")
stop_pulling()
log_combat(user, src, "grabbed", addition="aggressive grab[add_log]")
if(GRAB_NECK)
log_combat(user, src, "grabbed", addition="neck grab")
visible_message("[user] grabs [src] by the neck!",\
- "[user] grabs you by the neck!")
+ "[user] grabs you by the neck!", "You hear aggressive shuffling!", null, user)
+ to_chat(user, "You grab [src] by the neck!")
if(!buckled && !density)
Move(user.loc)
if(GRAB_KILL)
log_combat(user, src, "strangled", addition="kill grab")
visible_message("[user] is strangling [src]!", \
- "[user] is strangling you!")
+ "[user] is strangling you!", "You hear aggressive shuffling!", null, user)
+ to_chat(user, "You're strangling [src]!")
if(!buckled && !density)
Move(user.loc)
user.set_pull_offsets(src, grab_state)
- return 1
+ return TRUE
/mob/living/attack_slime(mob/living/simple_animal/slime/M)
@@ -224,7 +229,8 @@
log_combat(M, src, "attacked")
M.do_attack_animation(src)
visible_message("\The [M.name] glomps [src]!", \
- "\The [M.name] glomps you!", null, COMBAT_MESSAGE_RANGE)
+ "\The [M.name] glomps you!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You glomp [src]!")
return TRUE
/mob/living/attack_basic_mob(mob/living/basic/user)
@@ -250,8 +256,9 @@
/mob/living/attack_animal(mob/living/simple_animal/M)
M.face_atom(src)
if(M.melee_damage == 0)
- visible_message("\The [M] [M.friendly] [src]!", \
- "\The [M] [M.friendly] you!", null, COMBAT_MESSAGE_RANGE)
+ visible_message("\The [M] [M.friendly_verb_continuous] [src]!", \
+ "\The [M] [M.friendly_verb_continuous] you!", null, COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You [M.friendly_verb_simple] [src]!")
return FALSE
if(HAS_TRAIT(M, TRAIT_PACIFISM))
to_chat(M, "You don't want to hurt anyone!")
@@ -260,8 +267,9 @@
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
M.do_attack_animation(src)
- visible_message("\The [M] [M.attacktext] [src]!", \
- "\The [M] [M.attacktext] you!", null, COMBAT_MESSAGE_RANGE)
+ visible_message("\The [M] [M.attack_verb_continuous] [src]!", \
+ "\The [M] [M.attack_verb_continuous] you!", null, COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You [M.attack_verb_simple] [src]!")
log_combat(M, src, "attacked")
return TRUE
@@ -283,7 +291,8 @@
log_combat(M, src, "attacked")
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
visible_message("[M.name] bites [src]!", \
- "[M.name] bites you!", null, COMBAT_MESSAGE_RANGE)
+ "[M.name] bites you!", "You hear a chomp!", COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You bite [src]!")
return TRUE
return FALSE
@@ -291,7 +300,8 @@
switch(L.a_intent)
if("help")
visible_message("[L.name] rubs its head against [src].", \
- "[L.name] rubs its head against you.")
+ "[L.name] rubs its head against you.", null, null, L)
+ to_chat(L, "You rub your head against [src].")
return FALSE
else
@@ -303,12 +313,14 @@
if(prob(90))
log_combat(L, src, "attacked")
visible_message("[L.name] bites [src]!", \
- "[L.name] bites you!", null, COMBAT_MESSAGE_RANGE)
- playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
+ "[L.name] bites you!", "You hear a chomp!", COMBAT_MESSAGE_RANGE, L)
+ to_chat(L, "You bite [src]!")
+ playsound(loc, 'sound/weapons/bite.ogg', 50, TRUE, -1)
return TRUE
else
visible_message("[L.name]'s bite misses [src]!", \
- "[L.name]'s bite misses you!", null, COMBAT_MESSAGE_RANGE)
+ "You avoid [L.name]'s bite!", "You hear the sound of jaws snapping shut!", COMBAT_MESSAGE_RANGE, L)
+ to_chat(L, "Your bite misses [src]!")
return FALSE
/mob/living/attack_alien(mob/living/carbon/alien/humanoid/M)
@@ -316,7 +328,8 @@
switch(M.a_intent)
if ("help")
visible_message("[M] caresses [src] with its scythe-like arm.", \
- "[M] caresses you with its scythe-like arm.")
+ "[M] caresses you with its scythe-like arm.", null, null, M)
+ to_chat(M, "You caress [src] with your scythe-like arm.")
return FALSE
if ("grab")
grabbedby(M)
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index 3fbe8f1a1bc92..77a38249d0ac2 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -12,7 +12,8 @@
log_combat(M, src, "attacked", M)
playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
visible_message("[M] slashes at [src]!", \
- "[M] slashes at you!")
+ "[M] slashes at you!", null, null, M)
+ to_chat(M, "You slash at [src]!")
if(prob(8))
flash_act(affect_silicon = 1)
log_combat(M, src, "attacked", M)
@@ -21,7 +22,8 @@
else
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
visible_message("[M]'s swipe misses [src]!", \
- "[M]'s swipe misses you!")
+ "You avoid [M]'s swipe!", null, null, M)
+ to_chat(M, "Your swipe misses [src]!")
/mob/living/silicon/attack_animal(mob/living/simple_animal/M)
. = ..()
@@ -31,8 +33,9 @@
for(var/mob/living/N in buckled_mobs)
N.Paralyze(20)
unbuckle_mob(N)
- N.visible_message("[N] is knocked off of [src] by [M]!", \
- "You're knocked off of [src] by [M]!")
+ N.visible_message("[N] is knocked off of [src] by [M]!", \
+ "You're knocked off of [src] by [M]!", null, null, M)
+ to_chat(M, "You knock [N] off of [src]!")
switch(M.melee_damage_type)
if(BRUTE)
adjustBruteLoss(damage)
@@ -60,7 +63,8 @@
adjustBruteLoss(rand(10, 15))
playsound(loc, "punch", 25, 1, -1)
visible_message("[user] punches [src]!", \
- "[user] punches you!", null, COMBAT_MESSAGE_RANGE)
+ "[user] punches you!", null, COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, "You punch [src]!")
return 1
return 0
@@ -71,8 +75,9 @@
. = TRUE
switch(M.a_intent)
if ("help")
- M.visible_message("[M] pets [src].", \
- "You pet [src].")
+ visible_message("[M] pets [src].", \
+ "[M] pets you.", null, null, M)
+ to_chat(M, "You pet [src].")
if("grab")
grabbedby(M)
else
@@ -89,7 +94,8 @@
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
playsound(src.loc, 'sound/effects/bang.ogg', 10, 1)
visible_message("[M] punches [src], but doesn't leave a dent!", \
- "[M] punches you, but doesn't leave a dent!", null, COMBAT_MESSAGE_RANGE)
+ "[M] punches you, but doesn't leave a dent!", null, COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You punch [src], but don't leave a dent!")
log_combat(M, src, "tried to punch", important = FALSE)
/mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M)
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index a5e3a17fcc9a7..b396e9d2508b2 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -5,8 +5,9 @@
switch(M.a_intent)
if("help")
if (health > 0)
- visible_message("[M] [response_help] [src].", \
- "[M] [response_help] you.")
+ visible_message("[M] [response_help_continuous] [src].", \
+ "[M] [response_help_continuous] you.", null, null, M)
+ to_chat(M, "You [response_help_simple] [src].")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if("grab")
@@ -33,8 +34,9 @@
to_chat(M, "You don't want to hurt [src]!")
return
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
- visible_message("[M] [response_harm] [src]!",\
- "[M] [response_harm] you!", null, COMBAT_MESSAGE_RANGE)
+ visible_message("[M] [response_harm_continuous] [src]!",\
+ "[M] [response_harm_continuous] you!", null, COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You [response_harm_simple] [src]!")
playsound(loc, attacked_sound, 25, 1, -1)
attack_threshold_check(M.dna.species.punchdamage)
log_combat(M, src, "attacked", "harm")
@@ -49,7 +51,8 @@
..(user, 1)
playsound(loc, "punch", 25, 1, -1)
visible_message("[user] punches [src]!", \
- "[user] punches you!", null, COMBAT_MESSAGE_RANGE)
+ "You're punched by [user]!", null, COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, "You punch [src]!")
adjustBruteLoss(15)
return TRUE
@@ -61,8 +64,9 @@
return 1
if (M.a_intent == INTENT_HELP)
if (health > 0)
- visible_message("[M.name] [response_help] [src].", \
- "[M.name] [response_help] you.")
+ visible_message("[M.name] [response_help_continuous] [src].", \
+ "[M.name] [response_help_continuous] you.", null, COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You [response_help_simple] [src].")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
@@ -70,13 +74,15 @@
if(..()) //if harm or disarm intent.
if(M.a_intent == INTENT_DISARM)
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
- visible_message("[M] [response_disarm] [name]!", \
- "[M] [response_disarm] you!", null, COMBAT_MESSAGE_RANGE)
+ visible_message("[M] [response_disarm_continuous] [name]!", \
+ "[M] [response_disarm_continuous] you!", null, COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You [response_disarm_simple] [name]!")
log_combat(M, src, "disarmed", "disarm")
else
var/damage = rand(15, 30)
visible_message("[M] slashes at [src]!", \
- "[M] slashes at you!", null, COMBAT_MESSAGE_RANGE)
+ "You're slashed at by [M]!", null, COMBAT_MESSAGE_RANGE, M)
+ to_chat(M, "You slash at [src]!")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
attack_threshold_check(damage)
log_combat(M, src, "attacked", "harm")
@@ -123,7 +129,7 @@
temp_damage *= damage_coeff[damagetype]
if(temp_damage >= 0 && temp_damage <= force_threshold)
- visible_message("[src] looks unharmed.")
+ visible_message("[src] looks unharmed!")
return FALSE
else
apply_damage(damage, damagetype, null, getarmor(null, armorcheck))
diff --git a/code/modules/mob/living/simple_animal/cluwne.dm b/code/modules/mob/living/simple_animal/cluwne.dm
index 6ad34c91ec5ff..6646577b7579b 100644
--- a/code/modules/mob/living/simple_animal/cluwne.dm
+++ b/code/modules/mob/living/simple_animal/cluwne.dm
@@ -1,53 +1,54 @@
/mob/living/simple_animal/cluwne
- name = "The Cluwne"
- real_name = "The Cluwne"
- desc = "A cluwne. A barely-human monstrosity that pissed off the gods."
- friendly = "bops"
- turns_per_move = 10
- icon_state = "cluwne"
- icon_living = "cluwne"
- icon_dead = "cluwne_dead"
- speak_emote = list("sadly honks")
- attack_sound = 'sound/items/bikehorn.ogg'
- loot = list(/obj/effect/decal/cleanable/blood/gibs)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 0
- maxbodytemp = 1500
- maxHealth = 150
- health = 150
- speak = list("HONK! HONK! HONK! HONK!","AAAAAAAAAAAAAAAAAA!!", "KILLMEKILLME!!", "HONK HENK HONK!!", "Honk Honk!", "HEEEEEEEEEEEEENK!!")
- speak_language = /datum/language/metalanguage // It's cursing cluwne why not
- footstep_type = FOOTSTEP_MOB_SHOE
- chat_color = "#F37EF6"
- discovery_points = 1000
+ name = "The Cluwne"
+ real_name = "The Cluwne"
+ desc = "A cluwne. A barely-human monstrosity that pissed off the gods."
+ friendly_verb_continuous = "bops"
+ friendly_verb_simple = "bop"
+ turns_per_move = 10
+ icon_state = "cluwne"
+ icon_living = "cluwne"
+ icon_dead = "cluwne_dead"
+ speak_emote = list("sadly honks")
+ attack_sound = 'sound/items/bikehorn.ogg'
+ loot = list(/obj/effect/decal/cleanable/blood/gibs)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ maxbodytemp = 1500
+ maxHealth = 150
+ health = 150
+ speak = list("HONK! HONK! HONK! HONK!","AAAAAAAAAAAAAAAAAA!!", "KILLMEKILLME!!", "HONK HENK HONK!!", "Honk Honk!", "HEEEEEEEEEEEEENK!!")
+ speak_language = /datum/language/metalanguage // It's cursing cluwne why not
+ footstep_type = FOOTSTEP_MOB_SHOE
+ chat_color = "#F37EF6"
+ discovery_points = 1000
/mob/living/simple_animal/cluwne/Initialize(mapload)
- . = ..()
- playsound(src, 'sound/misc/honk_echo_distant.ogg', 90, 2) // loud
- var/newname = pick(GLOB.clown_names)
- name = newname
- real_name = newname
- AddComponent(/datum/component/waddling) // sad man
+ . = ..()
+ playsound(src, 'sound/misc/honk_echo_distant.ogg', 90, 2) // loud
+ var/newname = pick(GLOB.clown_names)
+ name = newname
+ real_name = newname
+ AddComponent(/datum/component/waddling) // sad man
/mob/living/simple_animal/cluwne/emote(act, m_type=1, message = null, intentional = FALSE)
- if(intentional)
- message = "makes a sad honk."
- act = "me"
- ..()
+ if(intentional)
+ message = "makes a sad honk."
+ act = "me"
+ ..()
/mob/living/simple_animal/cluwne/UnarmedAttack(atom/A, proximity)
- playsound(src, 'sound/items/bikehorn.ogg', 20, 2)
- ..()
+ playsound(src, 'sound/items/bikehorn.ogg', 20, 2)
+ ..()
/mob/living/simple_animal/cluwne/attacked_by(obj/item/I, mob/living/user)
- playsound(src, 'sound/items/bikehorn.ogg', 20, 2)
- ..()
+ playsound(src, 'sound/items/bikehorn.ogg', 20, 2)
+ ..()
/mob/living/simple_animal/cluwne/attack_hand()
- playsound(src, 'sound/items/bikehorn.ogg', 20, 2)
- ..()
+ playsound(src, 'sound/items/bikehorn.ogg', 20, 2)
+ ..()
/mob/living/simple_animal/cluwne/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
- message = pick(speak)
- ..()
+ message = pick(speak)
+ ..()
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index b85c5fd56f5ba..0517752446447 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -5,9 +5,12 @@
gender = NEUTER
mob_biotypes = list(MOB_INORGANIC)
speak_emote = list("hisses")
- response_help = "thinks better of touching"
- response_disarm = "flails at"
- response_harm = "punches"
+ response_help_continuous = "thinks better of touching"
+ response_help_simple = "think better of touching"
+ response_disarm_continuous = "flails at"
+ response_disarm_simple = "flail at"
+ response_harm_continuous = "punches"
+ response_harm_simple = "punch"
speak_chance = 1
icon = 'icons/mob/cult.dmi'
speed = 0
@@ -138,11 +141,13 @@
icon_living = "juggernaut"
maxHealth = 150
health = 150
- response_harm = "punches"
+ response_harm_continuous = "punches"
+ response_harm_simple = "punch"
obj_damage = 90
melee_damage = 25
- attacktext = "smashes their armored gauntlet into"
+ attack_verb_continuous = "smashes their armored gauntlet into"
+ attack_verb_simple = "smash your armored gauntlet into"
speed = 2.5
environment_smash = ENVIRONMENT_SMASH_WALLS
attack_sound = 'sound/weapons/punch3.ogg'
@@ -214,7 +219,8 @@
health = 65
melee_damage = 20
retreat_distance = 2 //AI wraiths will move in and out of combat
- attacktext = "slashes"
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
construct_spells = list(/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift)
runetype = /datum/action/innate/cult/create_rune/tele
@@ -270,12 +276,14 @@
icon_living = "artificer"
maxHealth = 50
health = 50
- response_harm = "viciously beats"
+ response_harm_continuous = "viciously beats"
+ response_harm_simple = "viciously beat"
obj_damage = 60
melee_damage = 5
retreat_distance = 10
minimum_distance = 10 //AI artificers will flee like fuck
- attacktext = "rams"
+ attack_verb_continuous = "rams"
+ attack_verb_simple = "ram"
environment_smash = ENVIRONMENT_SMASH_WALLS
attack_sound = 'sound/weapons/punch2.ogg'
construct_spells = list(
@@ -378,7 +386,8 @@
health = 40
sight = SEE_MOBS
melee_damage = 15
- attacktext = "butchers"
+ attack_verb_continuous = "butchers"
+ attack_verb_simple = "butcher"
attack_sound = 'sound/weapons/bladeslice.ogg'
construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/area_conversion,
/obj/effect/proc_holder/spell/targeted/forcewall/cult)
@@ -442,7 +451,8 @@
health = 35
melee_damage = 9
retreat_distance = 4 //AI proteons will rapidly move in and out of combat to avoid conflict, but will still target and follow you.
- attacktext = "pinches"
+ attack_verb_continuous = "pinches"
+ attack_verb_simple = "pinch"
environment_smash = ENVIRONMENT_SMASH_WALLS
attack_sound = 'sound/weapons/punch2.ogg'
playstyle_string = "You are a Proteon. Your abilities in combat are outmatched by most combat constructs, but you are still fast and nimble. Run metal and supplies, and cooperate with your fellow cultists."
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index a801c06a148cb..fe890e42c6f3e 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -5,13 +5,17 @@
icon_living = "butterfly"
icon_dead = "butterfly_dead"
turns_per_move = 1
- response_help = "shoos"
- response_disarm = "brushes aside"
- response_harm = "squashes"
+ response_help_continuous = "shoos"
+ response_help_simple = "shoo"
+ response_disarm_continuous = "brushes aside"
+ response_disarm_simple = "brush aside"
+ response_harm_continuous = "squashes"
+ response_harm_simple = "squash"
speak_emote = list("flutters")
maxHealth = 2
health = 2
- friendly = "nudges"
+ friendly_verb_continuous = "nudges"
+ friendly_verb_simple = "nudge"
density = FALSE
movement_type = FLYING
pass_flags = PASSTABLE | PASSMOB
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 1301235f2f963..629b172c153a5 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -25,9 +25,12 @@
animal_species = /mob/living/simple_animal/pet/cat
childtype = list(/mob/living/simple_animal/pet/cat/kitten)
butcher_results = list(/obj/item/food/meat/slab = 2, /obj/item/organ/ears/cat = 1, /obj/item/organ/tail/cat = 1, /obj/item/organ/tongue/cat = 1)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
var/turns_since_scan = 0
var/mob/living/simple_animal/mouse/movement_target
gold_core_spawnable = FRIENDLY_SPAWN
@@ -265,7 +268,8 @@
gender = FEMALE
butcher_results = list(/obj/item/organ/brain = 1, /obj/item/organ/heart = 1, /obj/item/food/cakeslice/birthday = 3, \
/obj/item/food/meat/slab = 2)
- response_harm = "takes a bite out of"
+ response_harm_continuous = "takes a bite out of"
+ response_harm_simple = "take a bite out of"
attacked_sound = 'sound/items/eatfood.ogg'
deathmessage = "loses its false life and collapses!"
deathsound = "bodyfall"
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 59b22e4757f55..adf05dac71918 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -11,11 +11,15 @@
speak_chance = 1
turns_per_move = 5
butcher_results = list(/obj/item/food/meat/rawcrab = 2)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "stomps"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "stomps"
+ response_harm_simple = "stomp"
stop_automated_movement = 1
- friendly = "pinches"
+ friendly_verb_continuous = "pinches"
+ friendly_verb_simple = "pinch"
ventcrawler = VENTCRAWLER_ALWAYS
var/obj/item/inventory_head
var/obj/item/inventory_mask
@@ -47,9 +51,6 @@
real_name = "Coffee"
desc = "It's Coffee, the other pet!"
gender = FEMALE
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "stomps"
gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/crab/evil
@@ -59,9 +60,6 @@
icon_state = "evilcrab"
icon_living = "evilcrab"
icon_dead = "evilcrab_dead"
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "stomps"
gold_core_spawnable = HOSTILE_SPAWN
held_state = "evilcrab"
@@ -72,9 +70,6 @@
icon_state = "kreb"
icon_living = "kreb"
icon_dead = "kreb_dead"
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "stomps"
gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/crab/evil/kreb
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index fc2d591ba7630..5536376f15248 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -2,9 +2,12 @@
/mob/living/simple_animal/pet/dog
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
- response_help = "pets"
- response_disarm = "bops"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "bops"
+ response_disarm_simple = "bop"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
speak_emote = list("barks", "woofs")
speak_language = /datum/language/metalanguage
@@ -367,9 +370,12 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
desc = "It's the HoP's beloved corgi."
var/turns_since_scan = 0
var/obj/movement_target
- response_help = "pets"
- response_disarm = "bops"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "bops"
+ response_disarm_simple = "bop"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
var/age = 0
@@ -660,9 +666,12 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
icon_state = "lisa"
icon_living = "lisa"
icon_dead = "lisa_dead"
- response_help = "pets"
- response_disarm = "bops"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "bops"
+ response_disarm_simple = "bop"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
held_state = "lisa"
worn_slot_flags = ITEM_SLOT_HEAD
var/turns_since_scan = 0
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index b1afb10aa3f78..9753d13f777cc 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -14,13 +14,17 @@
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/meat/slab = 4)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
faction = list("neutral")
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
attack_same = 1
- attacktext = "kicks"
+ attack_verb_continuous = "kicks"
+ attack_verb_simple = "kick"
attack_sound = 'sound/weapons/punch1.ogg'
health = 40
maxHealth = 40
@@ -113,10 +117,14 @@
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/meat/slab = 6)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "kicks"
- attacktext = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
+ attack_verb_continuous = "kicks"
+ attack_verb_simple = "kick"
attack_sound = 'sound/weapons/punch1.ogg'
health = 50
maxHealth = 50
@@ -180,10 +188,14 @@
speak_chance = 2
turns_per_move = 2
butcher_results = list(/obj/item/food/meat/slab/chicken = 1)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "kicks"
- attacktext = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
+ attack_verb_continuous = "kicks"
+ attack_verb_simple = "kick"
health = 3
maxHealth = 3
ventcrawler = VENTCRAWLER_ALWAYS
@@ -243,10 +255,14 @@
butcher_results = list(/obj/item/food/meat/slab/chicken = 2)
var/egg_type = /obj/item/food/egg
var/food_type = /obj/item/food/grown/wheat
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "kicks"
- attacktext = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
+ attack_verb_continuous = "kicks"
+ attack_verb_simple = "kick"
health = 15
maxHealth = 15
ventcrawler = VENTCRAWLER_ALWAYS
@@ -343,7 +359,8 @@
health = 15
maxHealth = 15
egg_type = null
- attacktext = "pecks"
+ attack_verb_continuous = "pecks"
+ attack_verb_simple = "peck"
attack_sound = 'sound/creatures/turkey.ogg'
ventcrawler = VENTCRAWLER_ALWAYS
icon_prefix = "turkey"
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index cf24b949b2a6a..58e3b20608358 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -15,9 +15,12 @@
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/meat/slab = 3)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
gold_core_spawnable = FRIENDLY_SPAWN
chat_color = "#FFAE64"
mobchatspan = "fox"
diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm
index 906ee5e0bb914..b6fddfac2f7f8 100644
--- a/code/modules/mob/living/simple_animal/friendly/gondola.dm
+++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm
@@ -9,9 +9,12 @@
name = "gondola"
real_name = "gondola"
desc = "Gondola is the silent walker. Having no hands he embodies the Taoist principle of wu-wei (non-action) while his smiling facial expression shows his utter and complete acceptance of the world as it is. Its hide is extremely valuable."
- response_help = "pets"
- response_disarm = "bops"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "bops"
+ response_disarm_simple = "bop"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
faction = list("gondola")
turns_per_move = 10
icon = 'icons/mob/gondolas.dmi'
diff --git a/code/modules/mob/living/simple_animal/friendly/hamster.dm b/code/modules/mob/living/simple_animal/friendly/hamster.dm
index bb973b11bbc6c..6c6518794121a 100644
--- a/code/modules/mob/living/simple_animal/friendly/hamster.dm
+++ b/code/modules/mob/living/simple_animal/friendly/hamster.dm
@@ -1,8 +1,11 @@
/mob/living/simple_animal/pet/hamster
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
- response_help = "pets"
- response_disarm = "bops"
- response_harm = "bites"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "bops"
+ response_disarm_simple = "bop"
+ response_harm_continuous = "bites"
+ response_harm_simple = "bite"
speak = list("Squeak", "SQUEAK!")
speak_emote = list("squeak", "hisses", "squeals")
speak_language = /datum/language/metalanguage
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index a171d3e6a0cd8..5cf72cd461693 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -8,11 +8,15 @@
health = 5
maxHealth = 5
faction = list("Lizard")
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
melee_damage = 1
- response_help = "pets"
- response_disarm = "shoos"
- response_harm = "stomps on"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "shoos"
+ response_disarm_simple = "shoo"
+ response_harm_continuous = "stomps on"
+ response_harm_simple = "stomp on"
ventcrawler = VENTCRAWLER_ALWAYS
density = FALSE
pass_flags = PASSTABLE | PASSMOB
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 09924c6bf380c..f00050181adf6 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -15,9 +15,12 @@
maxHealth = 5
health = 5
butcher_results = list(/obj/item/food/meat/slab/mouse = 1)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "splats"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "shoos"
+ response_disarm_simple = "shoo"
+ response_harm_continuous = "stomps on"
+ response_harm_simple = "stomp on"
density = FALSE
ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE | PASSMOB
@@ -119,9 +122,12 @@
/mob/living/simple_animal/mouse/brown/Tom
name = "Tom"
desc = "Jerry the cat is not amused."
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "splats"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "shoos"
+ response_disarm_simple = "shoo"
+ response_harm_continuous = "stomps on"
+ response_harm_simple = "stomp on"
gold_core_spawnable = NO_SPAWN
/obj/item/food/deadmouse
diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
index 203a38cf7db7a..8dae018330b30 100644
--- a/code/modules/mob/living/simple_animal/friendly/penguin.dm
+++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -1,9 +1,12 @@
//Penguins
/mob/living/simple_animal/pet/penguin
- response_help = "pets"
- response_disarm = "bops"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "bops"
+ response_disarm_simple = "bop"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
speak = list("Gah Gah!", "NOOT NOOT!", "NOOT!", "Noot", "noot", "Prah!", "Grah!")
speak_emote = list("squawks", "gakkers")
speak_language = /datum/language/metalanguage
diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm
index f3fdc22f806b6..a2767296af453 100644
--- a/code/modules/mob/living/simple_animal/friendly/sloth.dm
+++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm
@@ -11,9 +11,12 @@
speak_chance = 1
turns_per_move = 5
butcher_results = list(/obj/item/food/meat/slab = 3)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
gold_core_spawnable = FRIENDLY_SPAWN
melee_damage = 18 //why the fuck does it do this much damage
diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm
index b965f85f7b43b..f5661462301aa 100644
--- a/code/modules/mob/living/simple_animal/friendly/snake.dm
+++ b/code/modules/mob/living/simple_animal/friendly/snake.dm
@@ -18,11 +18,15 @@
speak_emote = list("hisses")
health = 20
maxHealth = 20
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
melee_damage = 6
- response_help = "pets"
- response_disarm = "shoos"
- response_harm = "steps on"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "shoos"
+ response_disarm_simple = "shoo"
+ response_harm_continuous = "steps on"
+ response_harm_simple = "step on"
faction = list("hostile")
ventcrawler = VENTCRAWLER_ALWAYS
density = FALSE
diff --git a/code/modules/mob/living/simple_animal/friendly/turtle.dm b/code/modules/mob/living/simple_animal/friendly/turtle.dm
index 907b014711b5b..df3429a634c4d 100644
--- a/code/modules/mob/living/simple_animal/friendly/turtle.dm
+++ b/code/modules/mob/living/simple_animal/friendly/turtle.dm
@@ -12,9 +12,12 @@
speak_chance = 1
turns_per_move = 5
butcher_results = list(/obj/item/food/meat/slab = 1, /obj/item/clothing/head/franks_hat = 1)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
gold_core_spawnable = NO_SPAWN
melee_damage = 0.5
diff --git a/code/modules/mob/living/simple_animal/heretic_monsters.dm b/code/modules/mob/living/simple_animal/heretic_monsters.dm
index d1c51324b1a8e..9783a615f10fa 100644
--- a/code/modules/mob/living/simple_animal/heretic_monsters.dm
+++ b/code/modules/mob/living/simple_animal/heretic_monsters.dm
@@ -6,9 +6,12 @@
gender = NEUTER
mob_biotypes = NONE
attack_sound = 'sound/weapons/punch1.ogg'
- response_help = "thinks better of touching"
- response_disarm = "flails at"
- response_harm = "reaps"
+ response_help_continuous = "thinks better of touching"
+ response_help_simple = "think better of touching"
+ response_disarm_continuous = "flails at"
+ response_disarm_simple = "flail at"
+ response_harm_continuous = "reaps"
+ response_harm_simple = "reap"
speak_emote = list("screams")
speak_chance = 1
speed = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index b8a0082514808..c67801a633cf1 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -7,9 +7,6 @@
icon_dead = "alienh_dead"
icon_gib = "syndicate_gib"
gender = FEMALE
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
butcher_results = list(/obj/item/food/meat/slab/xeno = 4,
/obj/item/stack/sheet/animalhide/xeno = 1)
@@ -17,7 +14,8 @@
health = 125
obj_damage = 60
melee_damage = 25
- attacktext = "slashes"
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
speak_emote = list("hisses")
bubble_icon = "alien"
a_intent = INTENT_HARM
@@ -158,7 +156,8 @@
name = "lusty xenomorph maid"
melee_damage = 0
a_intent = INTENT_HELP
- friendly = "caresses"
+ friendly_verb_continuous = "caresses"
+ friendly_verb_simple = "caress"
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
gold_core_spawnable = HOSTILE_SPAWN
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index e585d8143522f..0e7a907671896 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -17,9 +17,10 @@
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/meat/slab/bear = 5, /obj/item/clothing/head/costume/bearpelt = 1)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "hits"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
maxHealth = 60
health = 60
spacewalk = TRUE
@@ -27,9 +28,11 @@
obj_damage = 60
melee_damage = 25
- attacktext = "claws"
+ attack_verb_continuous = "claws"
+ attack_verb_simple = "claw"
attack_sound = 'sound/weapons/bladeslice.ogg'
- friendly = "bear hugs"
+ friendly_verb_continuous = "bear hugs"
+ friendly_verb_simple = "bear hug"
chat_color = "#CAA25B"
//Space bears aren't affected by cold.
@@ -120,12 +123,13 @@
obj_damage = 11
melee_damage = 1
armour_penetration = 0
- response_harm = "takes a bite out of"
+ response_harm_continuous = "takes a bite out of"
+ response_harm_simple = "take a bite out of"
attacked_sound = 'sound/items/eatfood.ogg'
deathmessage = "loses its false life and collapses!"
butcher_results = list(/obj/item/food/butter = 6, /obj/item/food/meat/slab = 3, /obj/item/organ/brain = 1, /obj/item/organ/heart = 1)
attack_sound = 'sound/weapons/slap.ogg'
- attacktext = "slaps"
+ attack_verb_continuous = "slaps"
/mob/living/simple_animal/hostile/bear/butter/Life() //Heals butter bear really fast when he takes damage.
if(stat)
@@ -161,23 +165,3 @@
playsound(loc, 'sound/misc/slip.ogg', 15)
L.visible_message("[L] slips on butter!")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index a4a8cbcf5e6ae..f83fc638d85e9 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -23,10 +23,14 @@
emote_hear = list("buzzes")
turns_per_move = 0
melee_damage = 1
- attacktext = "stings"
- response_help = "shoos"
- response_disarm = "swats away"
- response_harm = "squashes"
+ attack_verb_continuous = "stings"
+ attack_verb_simple = "sting"
+ response_help_continuous = "shoos"
+ response_help_simple = "shoo"
+ response_disarm_continuous = "swats away"
+ response_disarm_simple = "swat away"
+ response_harm_continuous = "squashes"
+ response_harm_simple = "squash"
maxHealth = 6
health = 6
spacewalk = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/bread.dm b/code/modules/mob/living/simple_animal/hostile/bread.dm
index 47bb2cd7da4c5..4c8ddba930b5b 100644
--- a/code/modules/mob/living/simple_animal/hostile/bread.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bread.dm
@@ -12,11 +12,7 @@
health = 30
see_in_dark = 3
butcher_results = list(/obj/item/food/breadslice/plain = 2)
- response_help = "pokes"
- response_disarm = "passes"
- response_harm = "breaks"
melee_damage = 10
- attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
ventcrawler = VENTCRAWLER_ALWAYS
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 8402e3408d7b6..a88869e9eedac 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -13,9 +13,10 @@
speak_chance = 0
turns_per_move = 5
butcher_results = list(/obj/item/food/fishmeat/carp = 2)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "hits"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
emote_taunt = list("gnashes")
taunt_chance = 30
speed = 0
@@ -25,7 +26,8 @@
obj_damage = 50
melee_damage = 20
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
speak_emote = list("gnashes")
chat_color = "#B15FB9"
diff --git a/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm b/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm
index 501549c9cd813..bcc21f0e9ab6b 100644
--- a/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm
+++ b/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm
@@ -14,16 +14,14 @@
ranged_cooldown_time = 30
speak_chance = 0
turns_per_move = 5
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
stat_attack = HARD_CRIT
robust_searching = 1
maxHealth = 100
health = 100
melee_damage = 15
- attacktext = "slashes at"
+ attack_verb_continuous = "slashes at"
+ attack_verb_simple = "slash at"
attack_sound = 'sound/weapons/circsawhit.ogg'
a_intent = INTENT_HARM
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
diff --git a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
index 8ffdf9d30c980..38eff231950a5 100644
--- a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
@@ -8,9 +8,10 @@
icon_gib = ""
gender = NEUTER
mob_biotypes = list(MOB_ORGANIC)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "hits"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
emote_taunt = list("glares")
taunt_chance = 25
maxHealth = 45
@@ -19,7 +20,8 @@
obj_damage = 60
melee_damage = 20
- attacktext = "blinks at"
+ attack_verb_continuous = "blinks at"
+ attack_verb_simple = "blink at"
attack_sound = 'sound/weapons/pierce.ogg'
movement_type = FLYING
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index 5f91ecc109ef2..d92ed2a316db3 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -8,9 +8,12 @@
gender = MALE
speak_chance = 0
turns_per_move = 5
- response_help = "passes through"
- response_disarm = "shoves"
- response_harm = "hits"
+ response_help_continuous = "passes through"
+ response_help_simple = "pass through"
+ response_disarm_continuous = "swings through"
+ response_disarm_simple = "swing through"
+ response_harm_continuous = "punches through"
+ response_harm_simple = "punch through"
emote_taunt = list("wails")
taunt_chance = 25
speed = 0
@@ -22,7 +25,8 @@
obj_damage = 50
melee_damage = 15
- attacktext = "grips"
+ attack_verb_continuous = "grips"
+ attack_verb_simple = "grip"
attack_sound = 'sound/hallucinations/growl1.ogg'
speak_emote = list("growls")
diff --git a/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm b/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
index d16cf8de121b3..6bebc3e09797c 100644
--- a/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
+++ b/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
@@ -17,7 +17,6 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
maxHealth = 250
health = 250
speed = -1
- attacktext = "attacks"
attack_sound = 'sound/items/bikehorn.ogg'
del_on_death = TRUE
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB | LETPASSTHROW | PASSTRANSPARENT | PASSBLOB//it's practically a ghost when unmanifested (under the floor)
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index ce8b371221c03..35ab586b1465c 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -31,9 +31,10 @@
turns_per_move = 5
see_in_dark = 10
butcher_results = list(/obj/item/food/meat/slab/spider = 2, /obj/item/food/spiderleg = 8)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "hits"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
initial_language_holder = /datum/language_holder/spider // Speaks buzzwords, understands buzzwords and common
maxHealth = 85
health = 85
@@ -45,7 +46,8 @@
pass_flags = PASSTABLE
move_to_delay = 4
ventcrawler = VENTCRAWLER_ALWAYS
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
unique_name = 1
gold_core_spawnable = HOSTILE_SPAWN
diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm
index dbb1df61806fd..32bdb2bb9e16e 100644
--- a/code/modules/mob/living/simple_animal/hostile/goose.dm
+++ b/code/modules/mob/living/simple_animal/hostile/goose.dm
@@ -10,16 +10,20 @@
speak_chance = 0
turns_per_move = 5
butcher_results = list(/obj/item/food/meat/slab = 2)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
emote_taunt = list("hisses")
taunt_chance = 30
speed = 0
maxHealth = 25
health = 25
melee_damage = 5
- attacktext = "pecks"
+ attack_verb_continuous = "pecks"
+ attack_verb_simple = "peck"
attack_sound = "goose"
speak_emote = list("honks")
faction = list("neutral")
@@ -42,9 +46,12 @@
real_name = "Birdboat"
desc = "It's a sick-looking goose, probably ate too much maintenance trash. Best not to move it around too much."
gender = MALE
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "kicks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
gold_core_spawnable = NO_SPAWN
random_retaliate = FALSE
var/vomiting = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
index 6661246c29a48..afd48366d5d79 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -15,15 +15,19 @@
health = 220
loot = list(/obj/effect/gibspawner/generic/animal)
butcher_results = list(/obj/item/food/meat/slab/gorilla = 4)
- response_help = "prods"
- response_disarm = "challenges"
- response_harm = "thumps"
+ response_help_continuous = "prods"
+ response_help_simple = "prod"
+ response_disarm_continuous = "challenges"
+ response_disarm_simple = "challenge"
+ response_harm_continuous = "thumps"
+ response_harm_simple = "thump"
speed = 1
melee_damage = 16
damage_coeff = list(BRUTE = 1, BURN = 1.5, TOX = 1.5, CLONE = 0, STAMINA = 0, OXY = 1.5)
obj_damage = 20
environment_smash = ENVIRONMENT_SMASH_WALLS
- attacktext = "pummels"
+ attack_verb_continuous = "pummels"
+ attack_verb_simple = "pummel"
attack_sound = 'sound/weapons/punch1.ogg'
dextrous = TRUE
held_items = list(null, null)
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
index 233dcdd9bc358..55bd35b8cb3b1 100644
--- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
@@ -10,7 +10,8 @@
health = 50
maxHealth = 50
melee_damage = 10
- attacktext = "chomps"
+ attack_verb_continuous = "chomps"
+ attack_verb_simple = "chomp"
attack_sound = 'sound/weapons/bite.ogg'
faction = list("creature")
robust_searching = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/heart.dm b/code/modules/mob/living/simple_animal/hostile/heart.dm
index f955d20acdfad..79d871172ea82 100644
--- a/code/modules/mob/living/simple_animal/hostile/heart.dm
+++ b/code/modules/mob/living/simple_animal/hostile/heart.dm
@@ -14,11 +14,15 @@
health = 24
speed = -1
melee_damage = 15
- response_help = "touches"
- response_disarm = "beats"
- response_harm = "breaks"
+ response_help_continuous = "touches"
+ response_help_simple = "touch"
+ response_disarm_continuous = "beats"
+ response_disarm_simple = "beat"
+ response_harm_continuous = "breaks"
+ response_harm_simple = "break"
density = FALSE
- attacktext = "beats"
+ attack_verb_continuous = "beats"
+ attack_verb_simple = "beat"
ventcrawler = VENTCRAWLER_ALWAYS
attack_sound = 'sound/effects/singlebeat.ogg'
stat_attack = HARD_CRIT
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index ff68632631c34..e7c5f9296de5a 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -15,7 +15,8 @@
maxHealth = 15
healable = 0
melee_damage = 3
- attacktext = "claws"
+ attack_verb_continuous = "claws"
+ attack_verb_simple = "claw"
attack_sound = 'sound/weapons/bladeslice.ogg'
projectilesound = 'sound/weapons/gunshot.ogg'
projectiletype = /obj/projectile/hivebotbullet
diff --git a/code/modules/mob/living/simple_animal/hostile/illusion.dm b/code/modules/mob/living/simple_animal/hostile/illusion.dm
index e75de5c84faee..e5326f6584377 100644
--- a/code/modules/mob/living/simple_animal/hostile/illusion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/illusion.dm
@@ -9,7 +9,8 @@
mob_biotypes = list()
melee_damage = 5
a_intent = INTENT_HARM
- attacktext = "gores"
+ attack_verb_continuous = "gores"
+ attack_verb_simple = "gore"
maxHealth = 100
health = 100
speed = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm b/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
index 207b3bca5aa87..d8111ab23c106 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
@@ -7,9 +7,8 @@
environment_smash = ENVIRONMENT_SMASH_WALLS
minbodytemp = 0
maxbodytemp = 450
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "strikes"
+ response_harm_continuous = "strikes"
+ response_harm_simple = "strike"
status_flags = NONE
a_intent = INTENT_HARM
see_in_dark = 4
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index 7e72bb886a493..dcf63397fbf69 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -11,11 +11,15 @@
health = 30
see_in_dark = 3
butcher_results = list(/obj/item/food/meat/slab/killertomato = 2)
- response_help = "prods"
- response_disarm = "pushes aside"
- response_harm = "smacks"
+ response_help_continuous = "prods"
+ response_help_simple = "prod"
+ response_disarm_continuous = "pushes aside"
+ response_disarm_simple = "push aside"
+ response_harm_continuous = "smacks"
+ response_harm_simple = "smack"
melee_damage = 10
- attacktext = "slams"
+ attack_verb_continuous = "slams"
+ attack_verb_simple = "slam"
attack_sound = 'sound/weapons/punch1.ogg'
ventcrawler = VENTCRAWLER_ALWAYS
faction = list("plants")
diff --git a/code/modules/mob/living/simple_animal/hostile/macrophage.dm b/code/modules/mob/living/simple_animal/hostile/macrophage.dm
index 350d999f2fad4..80e795eafc055 100644
--- a/code/modules/mob/living/simple_animal/hostile/macrophage.dm
+++ b/code/modules/mob/living/simple_animal/hostile/macrophage.dm
@@ -5,10 +5,14 @@
speak_emote = list("Blubbers")
emote_hear = list("Blubbers")
melee_damage = 1
- attacktext = "pierces"
- response_help = "shoos"
- response_disarm = "swats away"
- response_harm = "squashes"
+ attack_verb_continuous = "pierces"
+ attack_verb_simple = "pierce"
+ response_help_continuous = "shoos"
+ response_help_simple = "shoo"
+ response_disarm_continuous = "swats away"
+ response_disarm_simple = "swat away"
+ response_harm_continuous = "squashes"
+ response_harm_simple = "squash"
maxHealth = 6
health = 6
spacewalk = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 52bd3f1bdfc30..a10c97f6ee868 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -29,12 +29,14 @@ Difficulty: Hard
desc = "In what passes for a hierarchy among slaughter demons, this one is king."
health = 1250
maxHealth = 1250
- attacktext = "rends"
+ attack_verb_continuous = "rends"
+ attack_verb_simple = "rend"
attack_sound = 'sound/magic/demon_attack1.ogg'
icon_state = "bubblegum"
icon_living = "bubblegum"
icon_dead = ""
- friendly = "stares down"
+ friendly_verb_continuous = "stares down"
+ friendly_verb_simple = "stare down"
icon = 'icons/mob/lavaland/96x96megafauna.dmi'
speak_emote = list("gurgles")
armour_penetration = 40
@@ -568,7 +570,8 @@ Difficulty: Hard
icon_state = "bloodbrood"
icon_living = "bloodbrood"
icon_aggro = "bloodbrood"
- attacktext = "pierces"
+ attack_verb_continuous = "pierces"
+ attack_verb_simple = "pierce"
color = "#C80000"
density = FALSE
faction = list("mining", "boss")
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 3c15e33bd7259..1ae92cf7d81dc 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -26,12 +26,14 @@ Difficulty: Very Hard
desc = "A monstrous creature protected by heavy shielding."
health = 1250
maxHealth = 1250
- attacktext = "judges"
+ attack_verb_continuous = "judges"
+ attack_verb_simple = "judge"
attack_sound = 'sound/magic/clockwork/ratvar_attack.ogg'
icon_state = "eva"
icon_living = "eva"
icon_dead = ""
- friendly = "stares down"
+ friendly_verb_continuous = "stares down"
+ friendly_verb_simple = "stare down"
icon = 'icons/mob/lavaland/96x96megafauna.dmi'
speak_emote = list("roars")
armour_penetration = 40
@@ -695,13 +697,17 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box)
icon_living = "lightgeist"
icon_dead = "butterfly_dead"
turns_per_move = 1
- response_help = "waves away"
- response_disarm = "brushes aside"
- response_harm = "disrupts"
+ response_help_continuous = "waves away"
+ response_help_simple = "wave away"
+ response_disarm_continuous = "brushes aside"
+ response_disarm_simple = "brush aside"
+ response_harm_continuous = "disrupts"
+ response_harm_simple = "disrupt"
speak_emote = list("oscillates")
maxHealth = 2
health = 2
- friendly = "mends"
+ friendly_verb_continuous = "mends"
+ friendly_verb_simple = "mend"
density = FALSE
movement_type = FLYING
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index ebceb4d1aafc0..4b8ad3d0b1e66 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -31,13 +31,15 @@ Difficulty: Medium
desc = "Guardians of the necropolis."
health = 1250
maxHealth = 1250
- attacktext = "chomps"
+ attack_verb_continuous = "chomps"
+ attack_verb_simple = "chomp"
attack_sound = 'sound/magic/demon_attack1.ogg'
icon = 'icons/mob/lavaland/64x64megafauna.dmi'
icon_state = "dragon"
icon_living = "dragon"
icon_dead = "dragon_dead"
- friendly = "stares down"
+ friendly_verb_continuous = "stares down"
+ friendly_verb_simple = "stare down"
speak_emote = list("roars")
armour_penetration = 40
melee_damage = 40
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 57929c7ad9d62..757b359fd578c 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -39,11 +39,13 @@ Difficulty: Hard
desc = "A massive metal club that hangs in the air as though waiting. It'll make you dance to its beat."
health = 1250
maxHealth = 1250
- attacktext = "clubs"
+ attack_verb_continuous = "clubs"
+ attack_verb_simple = "club"
attack_sound = 'sound/weapons/sonic_jackhammer.ogg'
icon_state = "hierophant"
icon_living = "hierophant"
- friendly = "stares down"
+ friendly_verb_continuous = "stares down"
+ friendly_verb_simple = "stare down"
icon = 'icons/mob/lavaland/hierophant_new.dmi'
faction = list("boss") //asteroid mobs? get that shit out of my beautiful square house
speak_emote = list("preaches")
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 7184569458639..121d4f09b69b6 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
@@ -17,7 +17,8 @@ Difficulty: Medium
icon_living = "legion"
desc = "One of many."
icon = 'icons/mob/lavaland/legion.dmi'
- attacktext = "chomps"
+ attack_verb_continuous = "chomps"
+ attack_verb_simple = "chomp"
attack_sound = 'sound/magic/demon_attack1.ogg'
speak_emote = list("echoes")
armour_penetration = 50
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index ece1e6f2915bd..4bc042bdb1b11 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -5,9 +5,10 @@
icon_state = "crate"
icon_living = "crate"
- response_help = "touches"
- response_disarm = "pushes"
- response_harm = "hits"
+ response_help_continuous = "touches"
+ response_help_simple = "touch"
+ response_disarm_continuous = "pushes"
+ response_disarm_simple = "push"
speed = 0
maxHealth = 250
health = 250
@@ -15,7 +16,6 @@
mob_biotypes = list(MOB_INORGANIC)
melee_damage = 10
- attacktext = "attacks"
attack_sound = 'sound/weapons/punch1.ogg'
emote_taunt = list("growls")
speak_emote = list("creaks")
@@ -36,7 +36,8 @@
// Aggro when you try to open them. Will also pickup loot when spawns and drop it when dies.
/mob/living/simple_animal/hostile/mimic/crate
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
speak_emote = list("clatters")
stop_automated_movement = 1
wander = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/mimite.dm b/code/modules/mob/living/simple_animal/hostile/mimite.dm
index 4ad7b7b70b212..0989261f6412f 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimite.dm
@@ -16,9 +16,7 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
deathmessage = "splatters into a pile of black gunk!"
del_on_death = TRUE
- response_help = "touches"
- response_disarm = "pushes"
- response_harm = "hits"
+
speed = 3
maxHealth = 50
health = 50
@@ -30,7 +28,6 @@
aggro_vision_range = 4
armour_penetration = 10
rapid_melee = 2
- attacktext = "slashes"
attack_sound = 'sound/effects/meatslap.ogg'
emote_taunt = list("growls")
speak_emote = list("chitters")
@@ -317,7 +314,6 @@
icon = 'icons/obj/storage/crates.dmi'
icon_state = "crate"
icon_living = "crate"
- attacktext = "bites"
speak_emote = list("clatters")
vision_range = 0
aggro_vision_range = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
index e7449cae7af34..2617d977807f9 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
@@ -22,7 +22,8 @@
health = 100
obj_damage = 60
melee_damage = 12
- attacktext = "bites into"
+ attack_verb_continuous = "bites into"
+ attack_verb_simple = "bite into"
a_intent = INTENT_HARM
speak_emote = list("chitters")
attack_sound = 'sound/weapons/bladeslice.ogg'
@@ -72,7 +73,8 @@
base_pixel_x = -10
throw_message = "bounces harmlessly off of"
melee_damage = 15
- attacktext = "impales"
+ attack_verb_continuous = "impales"
+ attack_verb_simple = "impale"
a_intent = INTENT_HARM
speak_emote = list("telepathically cries")
attack_sound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
index b9daac962b972..a2d214b92fa6d 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
@@ -14,7 +14,8 @@
health = 40
melee_damage = 10
melee_damage_type = BURN
- attacktext = "slashes"
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
attack_sound = 'sound/effects/curseattack.ogg'
throw_message = "passes through the smokey body of"
obj_damage = 0
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 27c2d0d675fbe..a9f97eabaac23 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
@@ -29,7 +29,6 @@
health = 400
melee_damage = 30
armour_penetration = 30
- attacktext = "beats down on"
attack_sound = 'sound/weapons/punch1.ogg'
throw_message = "does nothing to the rocky hide of the"
speed = 2
@@ -167,7 +166,8 @@
maxHealth = 15
health = 15
melee_damage = 5
- attacktext = "bashes against"
+ attack_verb_continuous = "bashes against"
+ attack_verb_simple = "bash against"
attack_sound = 'sound/weapons/punch1.ogg'
throw_message = "does nothing to the rocky hide of the"
speed = 2
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 b2a2834b4c581..1f2e7a54654fb 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
@@ -27,7 +27,8 @@
maxHealth = 400
health = 400
melee_damage = 20
- attacktext = "preaches to"
+ attack_verb_continuous = "preaches to"
+ attack_verb_simple = "preach to"
attack_sound = 'sound/magic/clockwork/ratvar_attack.ogg'
throw_message = "doesn't affect the purity of"
speed = 4
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 b7ecca899540d..c934251bcecce 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
@@ -27,7 +27,8 @@
maxHealth = 400
health = 400
melee_damage = 30
- attacktext = "slashes its arms at"
+ attack_verb_continuous = "slashes at"
+ attack_verb_simple = "slash at"
attack_sound = 'sound/weapons/bladeslice.ogg'
throw_message = "doesn't affect the sturdiness of"
speed = 1
@@ -219,7 +220,8 @@
maxHealth = 40
health = 40
melee_damage = 10
- attacktext = "bites at"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
attack_sound = 'sound/effects/curse1.ogg'
throw_message = "simply misses"
speed = 0
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 62d5d5e788b1e..afa28f47a5e98 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
@@ -27,7 +27,8 @@
maxHealth = 400
health = 400
melee_damage = 15
- attacktext = "smashes into the side of"
+ attack_verb_continuous = "smashes into"
+ attack_verb_simple = "smash into"
attack_sound = 'sound/weapons/sonic_jackhammer.ogg'
throw_message = "merely dinks off of the"
speed = 4
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
index 1fe66ddc51e91..6bbf5902d0571 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
@@ -12,11 +12,13 @@
vision_range = 2
aggro_vision_range = 9
move_to_delay = 5
- friendly = "harmlessly rolls into"
+ friendly_verb_continuous = "harmlessly rolls into"
+ friendly_verb_simple = "harmlessly roll into"
maxHealth = 23
health = 23
melee_damage = 0
- attacktext = "barrels into"
+ attack_verb_continuous = "barrels into"
+ attack_verb_simple = "barrel into"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HELP
speak_emote = list("screeches")
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index dd7f054f8be9f..5beb5f20f0683 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -13,7 +13,8 @@
move_to_delay = 2 SECONDS
ranged = 1
ranged_cooldown_time = 80
- friendly = "wails at"
+ friendly_verb_continuous = "wails at"
+ friendly_verb_simple = "wail at"
speak_emote = list("bellows")
vision_range = 4
speed = 3
@@ -21,7 +22,8 @@
health = 150
obj_damage = 100
melee_damage = 25
- attacktext = "pulverizes"
+ attack_verb_continuous = "pulverizes"
+ attack_verb_simple = "pulverize"
attack_sound = 'sound/weapons/punch1.ogg'
throw_message = "does nothing to the rocky hide of the"
vision_range = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
index e65cbd6ee616b..8dab57a6c1b09 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
@@ -18,10 +18,14 @@
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
move_to_delay = 15
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "squishes"
- friendly = "pinches"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "squishes"
+ response_harm_simple = "squish"
+ friendly_verb_continuous = "pinches"
+ friendly_verb_simple = "pinch"
a_intent = INTENT_HELP
ventcrawler = VENTCRAWLER_ALWAYS
gold_core_spawnable = FRIENDLY_SPAWN
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 184b9faa5b06b..391c9b9f23b3b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -17,7 +17,8 @@
maxHealth = 38
health = 38
melee_damage = 0
- attacktext = "lashes out at"
+ attack_verb_continuous = "lashes out at"
+ attack_verb_simple = "lash out at"
speak_emote = list("telepathically cries")
attack_sound = 'sound/weapons/pierce.ogg'
throw_message = "falls right through the strange body of the"
@@ -65,14 +66,16 @@
icon_gib = "syndicate_gib"
mouse_opacity = MOUSE_OPACITY_OPAQUE
move_to_delay = 1
- friendly = "buzzes near"
+ friendly_verb_continuous = "buzzes near"
+ friendly_verb_simple = "buzz near"
vision_range = 10
speed = 3
maxHealth = 1
health = 1
movement_type = FLYING
melee_damage = 2
- attacktext = "slashes"
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
speak_emote = list("telepathically cries")
attack_sound = 'sound/weapons/pierce.ogg'
throw_message = "falls right through the strange body of the"
@@ -99,7 +102,8 @@
mouse_opacity = MOUSE_OPACITY_ICON
obj_damage = 60
melee_damage = 15
- attacktext = "lashes out at"
+ attack_verb_continuous = "lashes out at"
+ attack_verb_simple = "lash out at"
speak_emote = list("echoes")
attack_sound = 'sound/weapons/pierce.ogg'
throw_message = "bounces harmlessly off of"
@@ -159,12 +163,14 @@
icon_aggro = "legion_head"
icon_dead = "legion_head"
icon_gib = "syndicate_gib"
- friendly = "buzzes near"
+ friendly_verb_continuous = "buzzes near"
+ friendly_verb_simple = "buzz near"
vision_range = 10
maxHealth = 1
health = 5
melee_damage = 12
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
speak_emote = list("echoes")
attack_sound = 'sound/weapons/pierce.ogg'
throw_message = "is shrugged off by"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
index 49c7e0c4f74c8..63cd3c4816523 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
@@ -8,9 +8,8 @@
environment_smash = ENVIRONMENT_SMASH_WALLS
minbodytemp = 0
maxbodytemp = INFINITY
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "strikes"
+ response_harm_continuous = "strikes"
+ response_harm_simple = "strike"
status_flags = 0
a_intent = INTENT_HARM
var/crusher_loot
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 5c59623cf072b..3fee8d2e257d3 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -9,13 +9,17 @@
maxHealth = 10
health = 10
butcher_results = list(/obj/item/food/hugemushroomslice = 1)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "whacks"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "whacks"
+ response_harm_simple = "whack"
obj_damage = 0
melee_damage = 1
attack_same = 2
- attacktext = "chomps"
+ attack_verb_continuous = "chomps"
+ attack_verb_simple = "chomp"
attack_sound = 'sound/weapons/bite.ogg'
faction = list("mushroom")
environment_smash = ENVIRONMENT_SMASH_NONE
diff --git a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
index b3b02061b6366..6608aa9ceb883 100644
--- a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
+++ b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
@@ -9,16 +9,14 @@
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
speak_chance = 12
turns_per_move = 5
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
stat_attack = HARD_CRIT
robust_searching = 1
maxHealth = 100
health = 100
melee_damage = 12
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HARM
loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
index 6aeec87e5efb9..7bea60361fe49 100644
--- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm
+++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
@@ -8,7 +8,8 @@
maxHealth = 80
obj_damage = 100
melee_damage = 35
- attacktext = "slashes"
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
faction = list("creature")
speak_emote = list("screams")
@@ -26,7 +27,8 @@
icon_state = "mi-go"
icon_living = "mi-go"
icon_dead = "mi-go-dead"
- attacktext = "lacerates"
+ attack_verb_continuous = "lacerates"
+ attack_verb_simple = "lacerate"
speed = -0.5
var/static/list/migo_sounds
deathmessage = "wails as its form turns into a pulpy mush."
@@ -61,7 +63,8 @@
health = 100
maxHealth = 100
melee_damage = 10
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
deathmessage = "falls apart into a fine dust."
/obj/structure/spawner/nether
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index ee4eb2223ba22..3eb6b37a00eda 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -8,14 +8,14 @@
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
speak_chance = 0
turns_per_move = 5
- response_help = "pushes"
- response_disarm = "shoves"
- response_harm = "hits"
+ response_help_continuous = "pushes"
+ response_help_simple = "push"
speed = 0
maxHealth = 100
health = 100
melee_damage = 10
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HARM
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
@@ -35,7 +35,8 @@
icon_dead = "piratemelee_dead"
melee_damage = 30
armour_penetration = 35
- attacktext = "slashes"
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
attack_sound = 'sound/weapons/blade1.ogg'
var/obj/effect/light_emitter/red_energy_sword/sord
diff --git a/code/modules/mob/living/simple_animal/hostile/redgrub.dm b/code/modules/mob/living/simple_animal/hostile/redgrub.dm
index b13b2d42e6dc4..832ef5a97b43a 100644
--- a/code/modules/mob/living/simple_animal/hostile/redgrub.dm
+++ b/code/modules/mob/living/simple_animal/hostile/redgrub.dm
@@ -12,10 +12,14 @@
health = 4
melee_damage = 3
obj_damage = 0
- attacktext = "bites"
- response_help = "pets"
- response_disarm = "pokes"
- response_harm = "squishes"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "pokes"
+ response_disarm_simple = "poke"
+ response_harm_continuous = "squishes"
+ response_harm_simple = "squish"
density = FALSE
ventcrawler = VENTCRAWLER_ALWAYS
faction = list("hostile")
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
index 20135c151f96b..2e7f3ee0990d8 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -6,9 +6,10 @@
icon_dead = "bat_dead"
icon_gib = "bat_dead"
turns_per_move = 1
- response_help = "brushes aside"
- response_disarm = "flails at"
- response_harm = "hits"
+ response_help_continuous = "brushes aside"
+ response_help_simple = "brush aside"
+ response_disarm_continuous = "flails at"
+ response_disarm_simple = "flail at"
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
speak_chance = 0
maxHealth = 15
@@ -16,7 +17,8 @@
spacewalk = TRUE
see_in_dark = 10
melee_damage = 6
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
butcher_results = list(/obj/item/food/meat/slab = 1)
pass_flags = PASSTABLE
faction = list("hostile")
@@ -60,5 +62,6 @@
melee_damage = 15
min_oxy = 5
movement_type = GROUND
- response_help = "pets"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
turns_per_move = 10
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index d36021d7a6fec..22ee2359b6f9c 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -8,9 +8,10 @@
icon_gib = "clown_gib"
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
turns_per_move = 5
- response_help = "pokes"
- response_disarm = "gently pushes aside"
- response_harm = "robusts"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "robusts"
+ response_harm_simple = "robust"
speak = list("HONK", "Honk!", "Welcome to clown planet!")
speak_language = /datum/language/metalanguage // somehow clown speaks in this (same to all clown mobs)
emote_see = list("honks", "squeaks")
@@ -20,7 +21,6 @@
health = 75
speed = 1
melee_damage = 10
- attacktext = "attacks"
attack_sound = 'sound/items/bikehorn.ogg'
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
@@ -74,8 +74,10 @@
icon_state = "lube"
icon_living = "lube"
turns_per_move = 1
- response_help = "dips a finger into"
- response_disarm = "gently scoops and pours aside"
+ response_help_continuous = "dips a finger into"
+ response_help_simple = "dip a finger into"
+ response_disarm_continuous = "gently scoops and pours aside"
+ response_disarm_simple = "gently scoop and pour aside"
emote_see = list("bubbles", "oozes")
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/particle_effect/foam)
@@ -90,9 +92,10 @@
desc = "A fusion of clown and banana DNA birthed from a botany experiment gone wrong."
icon_state = "banana tree"
icon_living = "banana tree"
- response_help = "pokes"
- response_disarm = "peels"
- response_harm = "peels"
+ response_disarm_continuous = "peels"
+ response_disarm_simple = "peel"
+ response_harm_continuous = "peels"
+ response_harm_simple = "peel"
turns_per_move = 1
speak = list("HONK", "Honk!", "YA-HONK!!!")
emote_see = list("honks", "bites into the banana", "plucks a banana off its head", "photosynthesizes")
@@ -110,7 +113,8 @@
turns_per_move = 1
speed = -10
melee_damage = 1
- attacktext = "cheers up"
+ attack_verb_continuous = "cheers up"
+ attack_verb_simple = "cheer up"
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/human, /obj/item/soap, /obj/item/seeds/banana/bluespace)
banana_type = /obj/item/grown/bananapeel
attack_reagent = /datum/reagent/consumable/laughter
@@ -120,9 +124,12 @@
desc = "A being forged out of the pure essence of pranking, cursed into existence by a cruel maker."
icon_state = "fleshclown"
icon_living = "fleshclown"
- response_help = "reluctantly pokes"
- response_disarm = "sinks his hands into the spongy flesh of"
- response_harm = "cleanses the world of"
+ response_help_continuous = "reluctantly pokes"
+ response_help_simple = "reluctantly poke"
+ response_disarm_continuous = "sinks his hands into the spongy flesh of"
+ response_disarm_simple = "sink your hands into the spongy flesh of"
+ response_harm_continuous = "cleanses the world of"
+ response_harm_simple = "cleanse the world of"
speak = list("HONK", "Honk!", "I didn't ask for this", "I feel constant and horrible pain", "YA-HONK!!!", "this body is a merciless and unforgiving prison", "I was born out of mirthful pranking but I live in suffering")
emote_see = list("honks", "sweats", "jiggles", "contemplates its existence")
speak_chance = 5
@@ -132,7 +139,8 @@
health = 140
speed = -5
melee_damage = 15
- attacktext = "limply slaps"
+ attack_verb_continuous = "limply slaps"
+ attack_verb_simple = "limply slap"
obj_damage = 5
loot = list(/obj/item/clothing/suit/hooded/bloated_human, /obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/human, /obj/item/soap)
@@ -143,9 +151,12 @@
icon_living = "long face"
move_resist = INFINITY
turns_per_move = 10
- response_help = "tries awkwardly to hug"
- response_disarm = "pushes the unwieldy frame of"
- response_harm = "tries to shut up"
+ response_help_continuous = "tries to awkwardly hug"
+ response_help_simple = "try to awkwardly hug"
+ response_disarm_continuous = "pushes the unwieldy frame of"
+ response_disarm_simple = "push the unwieldy frame of"
+ response_harm_continuous = "tries to shut up"
+ response_harm_simple = "try to shut up"
speak = list("YA-HONK!!!")
emote_see = list("honks", "squeaks")
speak_chance = 60
@@ -155,7 +166,8 @@
base_pixel_x = -16
speed = 10
melee_damage = 5
- attacktext = "YA-HONKs"
+ attack_verb_continuous = "YA-HONKs"
+ attack_verb_simple = "YA-HONK"
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/human, /obj/item/soap)
/mob/living/simple_animal/hostile/retaliate/clown/clownhulk
@@ -164,9 +176,12 @@
icon_state = "honkhulk"
icon_living = "honkhulk"
move_resist = INFINITY
- response_help = "tries desperately to appease"
- response_disarm = "foolishly pushes"
- response_harm = "angers"
+ response_help_continuous = "tries desperately to appease"
+ response_help_simple = "try desperately to appease"
+ response_disarm_continuous = "foolishly pushes"
+ response_disarm_simple = "foolishly push"
+ response_harm_continuous = "angers"
+ response_harm_simple = "anger"
speak = list("HONK", "Honk!", "HAUAUANK!!!", "GUUURRRRAAAHHH!!!")
emote_see = list("honks", "sweats", "grunts")
speak_chance = 5
@@ -176,7 +191,8 @@
base_pixel_x = -16
speed = 2
melee_damage = 17
- attacktext = "pummels"
+ attack_verb_continuous = "pummels"
+ attack_verb_simple = "pummel"
obj_damage = 30
environment_smash = ENVIRONMENT_SMASH_WALLS
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/human, /obj/item/soap)
@@ -186,16 +202,20 @@
desc = "A real lunkhead who somehow gets all the girls."
icon_state = "chlown"
icon_living = "chlown"
- response_help = "submits to"
- response_disarm = "tries to assert dominance over"
- response_harm = "makes a weak beta attack at"
+ response_help_continuous = "submits to"
+ response_help_simple = "submit to"
+ response_disarm_continuous = "tries to assert dominance over"
+ response_disarm_simple = "try to assert dominance over"
+ response_harm_continuous = "makes a weak beta attack at"
+ response_harm_simple = "make a weak beta attack at"
speak = list("HONK", "Honk!", "Bruh", "cheeaaaahhh?")
emote_see = list("asserts his dominance", "emasculates everyone implicitly")
maxHealth = 500
health = 500
speed = -2
armour_penetration = 20
- attacktext = "steals the girlfriend of"
+ attack_verb_continuous = "steals the girlfriend of"
+ attack_verb_simple = "steal the girlfriend of"
attack_sound = 'sound/items/airhorn2.ogg'
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/human, /obj/effect/particle_effect/foam, /obj/item/soap)
@@ -204,8 +224,10 @@
desc = "A slender wiry figure of alchemical origin."
icon_state = "honkmunculus"
icon_living = "honkmunculus"
- response_help = "skeptically pokes"
- response_disarm = "pushes the unwieldy frame of"
+ response_help_continuous = "skeptically pokes"
+ response_help_simple = "skeptically poke"
+ response_disarm_continuous = "pushes the unwieldy frame of"
+ response_disarm_simple = "push the unwieldy frame of"
speak = list("honk")
emote_see = list("squirms", "writhes")
speak_chance = 1
@@ -213,7 +235,8 @@
health = 200
speed = -5
melee_damage = 10
- attacktext = "ferociously mauls"
+ attack_verb_continuous = "ferociously mauls"
+ attack_verb_simple = "ferociously maul"
environment_smash = ENVIRONMENT_SMASH_NONE
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/xeno/bodypartless, /obj/effect/particle_effect/foam, /obj/item/soap)
attack_reagent = /datum/reagent/peaceborg/confuse
@@ -223,8 +246,8 @@
desc = "An ancient being born of arcane honking."
icon_state = "destroyer"
icon_living = "destroyer"
- response_disarm = "bounces off of"
- response_harm = "bounces off of"
+ response_disarm_continuous = "bounces off of"
+ response_harm_continuous = "bounces off of"
speak = list("HONK!!!", "The Honkmother is merciful, so I must act out her wrath.", "parce mihi ad beatus honkmother placet mihi ut peccata committere,", "DIE!!!")
maxHealth = 400
health = 400
@@ -232,7 +255,8 @@
melee_damage = 30
armour_penetration = 30
stat_attack = HARD_CRIT
- attacktext = "acts out divine vengeance on"
+ attack_verb_continuous = "acts out divine vengeance on"
+ attack_verb_simple = "act out divine vengeance on"
obj_damage = 50
environment_smash = ENVIRONMENT_SMASH_RWALLS
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/human, /obj/effect/particle_effect/foam, /obj/item/soap)
@@ -244,9 +268,12 @@
icon_living = "mutant"
move_resist = INFINITY
turns_per_move = 10
- response_help = "reluctantly sinks a finger into"
- response_disarm = "squishes into"
- response_harm = "squishes into"
+ response_help_continuous = "reluctantly sinks a finger into"
+ response_help_simple = "reluctantly sink a finger into"
+ response_disarm_continuous = "squishes into"
+ response_disarm_simple = "squish into"
+ response_harm_continuous = "squishes into"
+ response_harm_simple = "squish into"
speak = list("aaaaaahhhhuuhhhuhhhaaaaa", "AAAaaauuuaaAAAaauuhhh", "huuuuuh... hhhhuuuooooonnnnkk", "HuaUAAAnKKKK")
emote_see = list("squirms", "writhes", "pulsates", "froths", "oozes")
speak_chance = 10
@@ -256,7 +283,8 @@
base_pixel_x = -16
speed = -5
melee_damage = 15
- attacktext = "awkwardly flails at"
+ attack_verb_continuous = "awkwardly flails at"
+ attack_verb_simple = "awkwardly flail at"
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/xeno/bodypartless, /obj/item/soap, /obj/effect/gibspawner/generic, /obj/effect/gibspawner/generic/animal, /obj/effect/gibspawner/human/bodypartless, /obj/effect/gibspawner/human)
/mob/living/simple_animal/hostile/retaliate/clown/mutant/blob
@@ -269,6 +297,7 @@
health = 130
mob_size = MOB_SIZE_LARGE
speed = 20
- attacktext = "bounces off of"
+ attack_verb_continuous = "bounces off of"
+ attack_verb_simple = "bounce off of"
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/xeno/bodypartless, /obj/effect/particle_effect/foam, /obj/item/soap, /obj/effect/gibspawner/generic, /obj/effect/gibspawner/generic/animal, /obj/effect/gibspawner/human/bodypartless, /obj/effect/gibspawner/human)
attack_reagent = /datum/reagent/toxin/mindbreaker
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/dolphin.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/dolphin.dm
index 695c09e52919e..4d69f31bb244c 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/dolphin.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/dolphin.dm
@@ -9,9 +9,12 @@
speak_chance = 0
turns_per_move = 5
butcher_results = list(/obj/item/food/meat/slab/dolphinmeat = 2)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "hits"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "kicks"
+ response_harm_simple = "kick"
emote_taunt = list("gnashes")
taunt_chance = 30
speed = 0
@@ -23,7 +26,8 @@
environment_smash = 0
melee_damage = 15
pass_flags = PASSTABLE
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
speak_emote = list("chitters", "squeeks", "clicks")
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
index c359cda2b977c..718e394d85a9b 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
@@ -13,10 +13,14 @@
maxHealth = 15
health = 15
melee_damage = 5
- attacktext = "bites"
- response_help = "pets"
- response_disarm = "pokes"
- response_harm = "splats"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "pokes"
+ response_disarm_simple = "poke"
+ response_harm_continuous = "splats"
+ response_harm_simple = "splat"
density = FALSE
ventcrawler = VENTCRAWLER_ALWAYS
faction = list("hostile")
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
index 7109e7abc58b8..f5149af8826f2 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
@@ -7,9 +7,12 @@
mob_biotypes = list(MOB_SPIRIT)
speak_chance = 0
turns_per_move = 5
- response_help = "passes through"
- response_disarm = "shoves"
- response_harm = "hits"
+ response_help_continuous = "passes through"
+ response_help_simple = "pass through"
+ response_disarm_continuous = "swings through"
+ response_disarm_simple = "swing through"
+ response_harm_continuous = "punches through"
+ response_harm_simple = "punch through"
a_intent = INTENT_HARM
healable = 0
speed = 0
@@ -18,7 +21,8 @@
melee_damage = 15
del_on_death = TRUE
emote_see = list("weeps silently", "groans", "mumbles")
- attacktext = "grips"
+ attack_verb_continuous = "grips"
+ attack_verb_simple = "grip"
attack_sound = 'sound/hallucinations/growl1.ogg'
speak_emote = list("weeps")
deathmessage = "wails, disintegrating into a pile of ectoplasm!"
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
index 1ffe61a4a9514..137c8372b6260 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
@@ -8,15 +8,17 @@
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
gender = MALE
turns_per_move = 5
- response_help = "pokes"
- response_disarm = "gently pushes aside"
- response_harm = "punches"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+ response_harm_continuous = "punches"
+ response_harm_simple = "punch"
a_intent = INTENT_HARM
maxHealth = 100
health = 100
speed = 0
melee_damage = 10
- attacktext = "hits"
+ attack_verb_continuous = "hits"
+ attack_verb_simple = "hit"
attack_sound = 'sound/weapons/punch1.ogg'
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
@@ -32,9 +34,6 @@
icon_dead = null
icon_gib = "syndicate_gib"
turns_per_move = 5
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
stat_attack = HARD_CRIT
robust_searching = 1
@@ -42,7 +41,8 @@
maxHealth = 100
health = 100
melee_damage = 12
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
faction = list("nanotrasenprivate")
a_intent = INTENT_HARM
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
index 407d42c2d0a59..85adbae6cc077 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -9,14 +9,12 @@
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
speak_chance = 0
turns_per_move = 5
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
maxHealth = 100
health = 100
melee_damage = 15
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HARM
loot = list(/obj/effect/mob_spawn/human/corpse/russian,
diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm
index 47a5427d3adad..665dda154986f 100644
--- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm
+++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm
@@ -18,7 +18,8 @@
minbodytemp = 0
maxbodytemp = 1500
healable = 0 //they're skeletons how would bruise packs help them??
- attacktext = "slashes"
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
attack_sound = 'sound/hallucinations/growl1.ogg'
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 10
@@ -98,7 +99,8 @@
health = 150
melee_damage = 17
light_color = LIGHT_COLOR_PURPLE
- attacktext = "slashes"
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
attack_sound = 'sound/hallucinations/growl1.ogg'
deathmessage = "collapses into a pile of bones, their suit dissolving among the plasma!"
loot = list(/obj/effect/decal/remains/plasma)
@@ -111,7 +113,8 @@
maxHealth = 185
health = 185
melee_damage = 22
- attacktext = "blasts"
+ attack_verb_continuous = "blasts"
+ attack_verb_simple = "blast"
attack_sound = 'sound/weapons/sonic_jackhammer.ogg'
environment_smash = ENVIRONMENT_SMASH_WALLS
loot = list(/obj/effect/decal/remains/plasma, /obj/item/pickaxe/drill/jackhammer)
diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
index 67350051038bf..661717fe758a5 100644
--- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
@@ -29,7 +29,8 @@
a_intent = INTENT_HARM
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
speed = 0
- attacktext = "chomps"
+ attack_verb_continuous = "chomps"
+ attack_verb_simple = "chomp"
attack_sound = 'sound/magic/demon_attack1.ogg'
deathsound = 'sound/creatures/space_dragon_roar.ogg'
icon = 'icons/mob/spacedragon.dmi'
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index c730bdf41627a..4e14b6fcf58ca 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -11,8 +11,10 @@
a_intent = INTENT_HARM
mob_biotypes = list(MOB_INORGANIC, MOB_HUMANOID)
- response_help = "touches"
- response_disarm = "pushes"
+ response_help_continuous = "touches"
+ response_help_simple = "touch"
+ response_disarm_continuous = "pushes"
+ response_disarm_simple = "push"
speed = -1
maxHealth = 50000
@@ -21,7 +23,8 @@
obj_damage = 100
melee_damage = 70
- attacktext = "claws"
+ attack_verb_continuous = "claws"
+ attack_verb_simple = "claw"
attack_sound = 'sound/hallucinations/growl1.ogg'
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/stickman.dm b/code/modules/mob/living/simple_animal/hostile/stickman.dm
index 2b9bf5c926728..686d1ee4e089c 100644
--- a/code/modules/mob/living/simple_animal/hostile/stickman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/stickman.dm
@@ -9,9 +9,6 @@
gender = MALE
speak_chance = 0
turns_per_move = 5
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
stat_attack = HARD_CRIT
robust_searching = 1
@@ -20,7 +17,8 @@
health = 100
obj_damage = 0
melee_damage = 10
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HARM
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index b3c458a614054..19ff51965dd2b 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -25,16 +25,14 @@
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
speak_chance = 0
turns_per_move = 5
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
stat_attack = HARD_CRIT
robust_searching = 1
maxHealth = 100
health = 100
melee_damage = 10
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HARM
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
@@ -78,7 +76,8 @@
icon_state = "syndicate_knife"
icon_living = "syndicate_knife"
loot = list(/obj/effect/gibspawner/human)
- attacktext = "slashes"
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
status_flags = 0
var/projectile_deflect_chance = 0
@@ -113,7 +112,8 @@
melee_damage = 30
icon_state = "syndicate_sword"
icon_living = "syndicate_sword"
- attacktext = "slashes"
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
attack_sound = 'sound/weapons/blade1.ogg'
armour_penetration = 35
light_color = LIGHT_COLOR_RED
@@ -285,7 +285,8 @@
melee_damage = 15
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
- attacktext = "cuts"
+ attack_verb_continuous = "cuts"
+ attack_verb_simple = "cut"
attack_sound = 'sound/weapons/bladeslice.ogg'
faction = list(FACTION_SYNDICATE)
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index b982d548d502f..64213374437fe 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -9,9 +9,10 @@
gender = NEUTER
speak_chance = 0
turns_per_move = 5
- response_help = "brushes"
- response_disarm = "pushes"
- response_harm = "hits"
+ response_help_continuous = "brushes"
+ response_help_simple = "brush"
+ response_disarm_continuous = "pushes"
+ response_disarm_simple = "push"
faction = list("plants")
speed = 1
maxHealth = 250
@@ -22,7 +23,8 @@
base_pixel_x = -16
melee_damage = 10
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
speak_emote = list("pines")
emote_taunt = list("growls")
diff --git a/code/modules/mob/living/simple_animal/hostile/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm
index 4acb0be8ca053..b8699820ef2c4 100644
--- a/code/modules/mob/living/simple_animal/hostile/wizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wizard.dm
@@ -8,14 +8,12 @@
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
speak_chance = 0
turns_per_move = 3
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
maxHealth = 100
health = 100
melee_damage = 5
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HARM
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
index 5abe515fe1365..3f2a4360235b2 100644
--- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
@@ -11,7 +11,8 @@
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
mouse_opacity = MOUSE_OPACITY_ICON
move_to_delay = 5
- friendly = "floats near"
+ friendly_verb_continuous = "floats near"
+ friendly_verb_simple = "float near"
speak_emote = list("puffs")
vision_range = 5
speed = 0
@@ -21,7 +22,8 @@
base_pixel_x = -16
obj_damage = 0
melee_damage = 0
- attacktext = "chomps"
+ attack_verb_continuous = "chomps"
+ attack_verb_simple = "chomp"
attack_sound = 'sound/weapons/punch1.ogg'
throw_message = "is avoided by the"
vision_range = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm
index 217750b056447..985a579a6a9ff 100644
--- a/code/modules/mob/living/simple_animal/hostile/zombie.dm
+++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm
@@ -10,7 +10,8 @@
maxHealth = 100
health = 100
melee_damage = 21
- attacktext = "bites"
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
attack_sound = 'sound/hallucinations/growl1.ogg'
a_intent = INTENT_HARM
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/kalo.dm b/code/modules/mob/living/simple_animal/kalo.dm
index e2d0f7b69086c..945c947ffc3b9 100644
--- a/code/modules/mob/living/simple_animal/kalo.dm
+++ b/code/modules/mob/living/simple_animal/kalo.dm
@@ -17,9 +17,12 @@
see_in_dark = 5
speak_chance = 1
turns_per_move = 3
- response_help = "pets"
- response_disarm = "shoos"
- response_harm = "stomps"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "shoos"
+ response_disarm_simple = "shoo"
+ response_harm_continuous = "stomps on"
+ response_harm_simple = "stomp on"
speak = list("Hissssss!", "Squeak!")
speak_emote = list("hisses", "squeaks")
speak_language = /datum/language/metalanguage
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 46736a45e475a..fb9041a2c67f3 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -54,13 +54,18 @@
butcher_results = list(/obj/item/food/cracker/ = 1)
melee_damage = 5
- response_help = "pets"
- response_disarm = "gently moves aside"
- response_harm = "swats"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently moves aside"
+ response_disarm_simple = "gently move aside"
+ response_harm_continuous = "swats"
+ response_harm_simple = "swat"
stop_automated_movement = 1
a_intent = INTENT_HARM //parrots now start "aggressive" since only player parrots will nuzzle.
- attacktext = "chomps"
- friendly = "grooms"
+ attack_verb_continuous = "chomps"
+ attack_verb_simple = "chomp"
+ friendly_verb_continuous = "grooms"
+ friendly_verb_simple = "groom"
mob_size = MOB_SIZE_SMALL
movement_type = FLYING
gold_core_spawnable = FRIENDLY_SPAWN
@@ -593,7 +598,8 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
parrot_state = PARROT_WANDER
return
- attacktext = pick("claws at", "chomps")
+ attack_verb_continuous = pick("claws at", "chomps")
+ attack_verb_simple = pick("claw at", "chomp")
L.attack_animal(src)//Time for the hurt to begin!
//Otherwise, fly towards the mob!
else
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 5b90a1ac7d227..8bc330969caaf 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -13,12 +13,16 @@
healable = 0
speak_emote = list("hisses")
emote_hear = list("wails.","screeches.")
- response_help = "puts their hand through"
- response_disarm = "flails at"
- response_harm = "punches"
+ response_help_continuous = "puts their hand through"
+ response_help_simple = "put your hand through"
+ response_disarm_continuous = "flails at"
+ response_disarm_simple = "flail at"
+ response_harm_continuous = "punches"
+ response_harm_simple = "punch"
speak_chance = 1
melee_damage = 5
- attacktext = "metaphysically strikes"
+ attack_verb_continuous = "metaphysically strikes"
+ attack_verb_simple = "metaphysically strike"
minbodytemp = 0
maxbodytemp = INFINITY
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index c81712dff034d..e11032b79fc47 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -25,10 +25,19 @@
var/wander = TRUE // Does the mob wander around when idle?
var/stop_automated_movement_when_pulled = 1 //When set to 1 this stops the animal from moving when someone is pulling it.
- //Interaction
- var/response_help = "pokes"
- var/response_disarm = "shoves"
- var/response_harm = "hits"
+ ///When someone interacts with the simple animal.
+ ///Help-intent verb in present continuous tense.
+ var/response_help_continuous = "pokes"
+ ///Help-intent verb in present simple tense.
+ var/response_help_simple = "poke"
+ ///Disarm-intent verb in present continuous tense.
+ var/response_disarm_continuous = "shoves"
+ ///Disarm-intent verb in present simple tense.
+ var/response_disarm_simple = "shove"
+ ///Harm-intent verb in present continuous tense.
+ var/response_harm_continuous = "hits"
+ ///Harm-intent verb in present simple tense.
+ var/response_harm_simple = "hit"
var/force_threshold = 0 //Minimum force required to deal any damage
//Temperature effect
@@ -42,14 +51,25 @@
var/list/atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) //Leaving something at 0 means it's off - has no maximum
var/unsuitable_atmos_damage = 2 //This damage is taken when atmos doesn't fit all the requirements above
- var/obj_damage = 0 //how much damage this simple animal does to objects, if any
- var/armour_penetration = 0 //How much armour they ignore, as a flat reduction from the targets armour value
- var/melee_damage_type = BRUTE //Damage type of a simple mob's melee attack, should it do damage.
- var/list/damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) // 1 for full damage , 0 for none , -1 for 1:1 heal from that source
- var/attacktext = "attacks"
+ ///how much damage this simple animal does to objects, if any.
+ var/obj_damage = 0
+ ///How much armour they ignore, as a flat reduction from the targets armour value.
+ var/armour_penetration = 0
+ ///Damage type of a simple mob's melee attack, should it do damage.
+ var/melee_damage_type = BRUTE
+ /// 1 for full damage , 0 for none , -1 for 1:1 heal from that source.
+ var/list/damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
+ ///Attacking verb in present continuous tense.
+ var/attack_verb_continuous = "attacks"
+ ///Attacking verb in present simple tense.
+ var/attack_verb_simple = "attack"
var/attack_sound = null
- var/friendly = "nuzzles" //If the mob does no damage with it's attack
- var/environment_smash = ENVIRONMENT_SMASH_NONE //Set to 1 to allow breaking of crates,lockers,racks,tables; 2 for walls; 3 for Rwalls
+ ///Attacking, but without damage, verb in present continuous tense.
+ var/friendly_verb_continuous = "nuzzles"
+ ///Attacking, but without damage, verb in present simple tense.
+ var/friendly_verb_simple = "nuzzle"
+ ///Set to 1 to allow breaking of crates,lockers,racks,tables; 2 for walls; 3 for Rwalls.
+ var/environment_smash = ENVIRONMENT_SMASH_NONE
var/hardattacks = FALSE //if true, a simplemob is unaffected by NASTY_BLOCKING
var/speed = 1 //LETS SEE IF I CAN SET SPEEDS FOR SIMPLE MOBS WITHOUT DESTROYING EVERYTHING. Higher speed is slower, negative speed is faster
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index 628b9a7163c7c..332c176063d6e 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -12,9 +12,12 @@
icon_living = "grey baby slime"
icon_dead = "grey baby slime dead"
- response_help = "pets"
- response_disarm = "shoos"
- response_harm = "stomps on"
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "shoos"
+ response_disarm_simple = "shoo"
+ response_harm_continuous = "stomps on"
+ response_harm_simple = "stomp on"
emote_see = list("jiggles", "bounces in place")
speak_emote = list("blorbles")
bubble_icon = "slime"
diff --git a/code/modules/multiz/movement/mob/living_zfall.dm b/code/modules/multiz/movement/mob/living_zfall.dm
index 9599a1f5bdcfc..2c29500be211d 100644
--- a/code/modules/multiz/movement/mob/living_zfall.dm
+++ b/code/modules/multiz/movement/mob/living_zfall.dm
@@ -28,7 +28,8 @@
/// Generic proc for most living things taking fall damage. Will attempt splitting between legs, if the mob has any.
/mob/living/proc/apply_general_zimpact_damage(turf/T, levels)
- visible_message("[src] falls [levels] level\s into [T] with a sickening noise!")
+ visible_message("[src] falls [levels] level\s into [T] with a sickening noise!", \
+ "You fall [levels] level\s, hitting [T] with a sickening noise!")
var/amount_total = get_distributed_zimpact_damage(levels)
var/total_damage_percent_left = 1
var/obj/item/bodypart/left_leg = get_bodypart(BODY_ZONE_L_LEG)
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index dc0972777808a..c468e2b468395 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -15,7 +15,8 @@
armour_penetration = 50
w_class = WEIGHT_CLASS_LARGE
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
sharpness = IS_SHARP
bleed_force = BLEED_DEEP_WOUND
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 14fa0b9507970..19a87e57a7202 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -226,7 +226,8 @@
* (Alan) Edaggers
*/
/obj/item/pen/edagger
- attack_verb = list("slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut") //these wont show up if the pen is off
+ attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") //these won't show up if the pen is off
+ attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
var/on = FALSE
/obj/item/pen/edagger/Initialize(mapload)
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index be10b48609860..7e584009c0113 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -10,7 +10,8 @@
throw_range = 7
custom_materials = list(/datum/material/iron=60)
pressure_resistance = 2
- attack_verb = list("stamped")
+ attack_verb_continuous = list("stamps")
+ attack_verb_simple = list("stamp")
dye_color = DYE_GREEN
/obj/item/stamp/suicide_act(mob/living/user)
diff --git a/code/modules/pool/pool_items.dm b/code/modules/pool/pool_items.dm
index a954867baab2c..1bc16b683d08a 100644
--- a/code/modules/pool/pool_items.dm
+++ b/code/modules/pool/pool_items.dm
@@ -6,7 +6,8 @@
damtype = STAMINA
w_class = WEIGHT_CLASS_BULKY
block_sound = 'sound/weapons/tap.ogg'
- attack_verb = list("wacked")
+ attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks")
+ attack_verb_simple = list("smash", "slam", "whack", "thwack")
/obj/item/pool/Initialize(mapload)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 9d65ff5d956c7..2ae1f7bdf31b0 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -494,7 +494,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
mats_per_unit = list(/datum/material/iron=10, /datum/material/glass=5)
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
- attack_verb = list("whipped", "lashed", "disciplined", "flogged")
+ attack_verb_continuous = list("whips", "lashes", "disciplines", "flogs")
+ attack_verb_simple = list("whip", "lash", "discipline", "flog")
singular_name = "cable piece"
full_w_class = WEIGHT_CLASS_SMALL
grind_results = list(/datum/reagent/copper = 2) //2 copper per cable in the coil
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index e8e9755a8a4bc..5e0d5df5189ab 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -673,9 +673,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
/obj/machinery/power/supermatter_crystal/attack_animal(mob/living/simple_animal/S)
var/murder
if(!S.melee_damage)
- murder = S.friendly
+ murder = S.friendly_verb_continuous
else
- murder = S.attacktext
+ murder = S.attack_verb_continuous
dust_mob(S, \
"[S] unwisely [murder] [src], and [S.p_their()] body burns brilliantly before flashing into ash!", \
"You unwisely touch [src], and your vision glows brightly as your body crumbles to dust. Oops.", \
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index b221f3691c2f3..547ec90e023a0 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -19,7 +19,8 @@
throw_range = 5
force = 5
item_flags = NEEDS_PERMIT || ISWEAPON
- attack_verb = list("struck", "hit", "bashed")
+ attack_verb_continuous = list("strikes", "hits", "bashes")
+ attack_verb_simple = list("strike", "hit", "bash")
var/fire_sound = "gunshot"
var/vary_fire_sound = TRUE
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index fa099f0431e86..710d0f7f38de1 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -345,7 +345,8 @@
weapon_weight = WEAPON_MEDIUM
can_sawoff = FALSE
force = 10 //it has a hook on it
- attack_verb = list("slashed", "hooked", "stabbed")
+ attack_verb_continuous = list("slashes", "hooks", "stabs")
+ attack_verb_simple = list("slash", "hook", "stab")
hitsound = 'sound/weapons/bladeslice.ogg'
//our hook gun!
var/obj/item/gun/magic/hook/bounty/hook
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 61fb530675605..416c973ddfaf4 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -148,7 +148,8 @@
item_state = "plasmacutter"
ammo_type = list(/obj/item/ammo_casing/energy/plasma)
flags_1 = CONDUCT_1
- attack_verb = list("attacked", "slashed", "cut", "sliced")
+ attack_verb_continuous = list("attacks", "slashes", "cuts", "slices")
+ attack_verb_simple = list("attack", "slash", "cut", "slice")
force = 12
sharpness = IS_SHARP
can_charge = FALSE
diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index 305a13e006e9d..43b9a61d47a73 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -6,7 +6,8 @@
item_state = "pen"
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_TINY
- attack_verb = list("poked")
+ attack_verb_continuous = list("pokes")
+ attack_verb_simple = list("poke")
var/fail_message = "INVALID USER."
var/selfdestruct = 0 // Explode when user check is failed.
var/force_replace = 0 // Can forcefully replace other pins.
diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
index d52370b12d505..b2842e13d2ad3 100644
--- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
@@ -39,19 +39,24 @@ Slimecrossing Weapons
switch(damtype)
if(BRUTE)
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("slashed","sliced","cut")
+ attack_verb_continuous = list("slashes", "slices", "cuts")
+ attack_verb_simple = list("slash", "slice", "cut")
if(BURN)
hitsound = 'sound/weapons/sear.ogg'
- attack_verb = list("burned","singed","heated")
+ attack_verb_continuous = list("burns", "sings", "heats")
+ attack_verb_simple = list("burn", "sing", "heat")
if(TOX)
hitsound = 'sound/weapons/pierce.ogg'
- attack_verb = list("poisoned","dosed","toxified")
+ attack_verb_continuous = list("poisons", "doses", "toxifies")
+ attack_verb_simple = list("poison", "dose", "toxify")
if(OXY)
hitsound = 'sound/effects/space_wind.ogg'
- attack_verb = list("suffocated","winded","vacuumed")
+ attack_verb_continuous = list("suffocates", "winds", "vacuums")
+ attack_verb_simple = list("suffocate", "wind", "vacuum")
if(CLONE)
hitsound = 'sound/items/geiger/ext1.ogg'
- attack_verb = list("irradiated","mutated","maligned")
+ attack_verb_continuous = list("irradiates", "mutates", "maligns")
+ attack_verb_simple = list("irradiate", "mutate", "malign")
return ..()
//Adamantine shield - Burning Adamantine
@@ -71,7 +76,8 @@ Slimecrossing Weapons
block_flags = BLOCKING_PROJECTILE
throw_range = 1 //How far do you think you're gonna throw a solid crystalline shield...?
throw_speed = 2
- attack_verb = list("bashed","pounded","slammed")
+ attack_verb_continuous = list("bashes", "pounds", "slams")
+ attack_verb_simple = list("bash", "pound", "slam")
item_flags = SLOWS_WHILE_IN_HAND
/obj/item/shield/adamantineshield/ComponentInitialize()
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 0cdd5a7539030..ad9e65c33931d 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -709,7 +709,8 @@
be possessed by the devil? This arm appears to be possessed by no \
one though."
//icon_state = "default_human_l_arm"
- attack_verb = list("slapped", "punched")
+ attack_verb_continuous = list("slaps", "punches")
+ attack_verb_simple = list("slap", "punch")
max_damage = 50
max_stamina_damage = 50
body_zone = BODY_ZONE_L_ARM
@@ -813,7 +814,8 @@
desc = "Over 87% of humans are right handed. That figure is much lower \
among humans missing their right arm."
//icon_state = "default_human_r_arm"
- attack_verb = list("slapped", "punched")
+ attack_verb_continuous = list("slaps", "punches")
+ attack_verb_simple = list("slap", "punch")
max_damage = 50
max_stamina_damage = 50
body_zone = BODY_ZONE_R_ARM
@@ -918,7 +920,8 @@
desc = "Some athletes prefer to tie their left shoelaces first for good \
luck. In this instance, it probably would not have helped."
//icon_state = "default_human_l_leg"
- attack_verb = list("kicked", "stomped")
+ attack_verb_continuous = list("kicks", "stomps")
+ attack_verb_simple = list("kick", "stomp")
max_damage = 50
body_zone = BODY_ZONE_L_LEG
body_part = LEG_LEFT
@@ -1016,7 +1019,8 @@
The hokey pokey has certainly changed a lot since space colonisation."
// alternative spellings of 'pokey' are available
//icon_state = "default_human_r_leg"
- attack_verb = list("kicked", "stomped")
+ attack_verb_continuous = list("kicks", "stomps")
+ attack_verb_simple = list("kick", "stomp")
max_damage = 50
body_zone = BODY_ZONE_R_LEG
body_part = LEG_RIGHT
diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm
index ef8a9a5a7a866..d2a495c9e8bb1 100644
--- a/code/modules/surgery/bodyparts/robot_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm
@@ -14,7 +14,8 @@
name = "cyborg left arm"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
limb_id = "robotic"
- attack_verb = list("slapped", "punched")
+ attack_verb_continuous = list("slaps", "punches")
+ attack_verb_simple = list("slap", "punch")
item_state = "buildpipe"
static_icon = 'icons/mob/augmentation/augments.dmi'
icon = 'icons/mob/augmentation/augments.dmi'
@@ -39,7 +40,8 @@
/obj/item/bodypart/r_arm/robot
name = "cyborg right arm"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
- attack_verb = list("slapped", "punched")
+ attack_verb_continuous = list("slaps", "punches")
+ attack_verb_simple = list("slap", "punch")
item_state = "buildpipe"
static_icon = 'icons/mob/augmentation/augments.dmi'
icon = 'icons/mob/augmentation/augments.dmi'
@@ -65,7 +67,8 @@
/obj/item/bodypart/l_leg/robot
name = "cyborg left leg"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
- attack_verb = list("kicked", "stomped")
+ attack_verb_continuous = list("kicks", "stomps")
+ attack_verb_simple = list("kick", "stomp")
item_state = "buildpipe"
static_icon = 'icons/mob/augmentation/augments.dmi'
icon = 'icons/mob/augmentation/augments.dmi'
@@ -91,7 +94,8 @@
/obj/item/bodypart/r_leg/robot
name = "cyborg right leg"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
- attack_verb = list("kicked", "stomped")
+ attack_verb_continuous = list("kicks", "stomps")
+ attack_verb_simple = list("kick", "stomp")
item_state = "buildpipe"
static_icon = 'icons/mob/augmentation/augments.dmi'
icon = 'icons/mob/augmentation/augments.dmi'
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index f359de46a4c65..531fa34ed7dbf 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -16,7 +16,8 @@
// Heart attack code is in code/modules/mob/living/carbon/human/life.dm
var/beating = 1
var/icon_base = "heart"
- attack_verb = list("beat", "thumped")
+ attack_verb_continuous = list("beats", "thumps")
+ attack_verb_simple = list("beat", "thump")
//is this mob having a heatbeat sound played? if so, which?
var/beat = BEAT_NONE
//to prevent constantly running failing code
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index 2c6cc4ee1d939..d1b5356fb3625 100755
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -117,7 +117,8 @@
/obj/item/organ/liver/cybernetic/upgraded/ipc
name = "substance processor"
icon_state = "substance_processor"
- attack_verb = list("processed")
+ attack_verb_continuous = list("processes")
+ attack_verb_simple = list("process")
desc = "A machine component, installed in the chest. This grants the Machine the ability to process chemicals that enter its systems."
alcohol_tolerance = 0
toxTolerance = -1
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index 6eb21a829db91..33630b88d1229 100755
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -4,7 +4,8 @@
w_class = WEIGHT_CLASS_SMALL
zone = BODY_ZONE_CHEST
slot = ORGAN_SLOT_STOMACH
- attack_verb = list("gored", "squished", "slapped", "digested")
+ attack_verb_continuous = list("gores", "squishes", "slaps", "digests")
+ attack_verb_simple = list("gore", "squish", "slap", "digest")
desc = "Onaka ga suite imasu."
healing_factor = STANDARD_ORGAN_HEALING
@@ -151,7 +152,8 @@
name = "micro-cell"
icon_state = "microcell"
w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("assault and battery'd")
+ attack_verb_continuous = list("assault and batteries")
+ attack_verb_simple = list("assault and battery")
desc = "A micro-cell, for IPC use. Do not swallow."
status = ORGAN_ROBOTIC
organ_flags = ORGAN_SYNTHETIC
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index c1da699200ce6..8debda384483d 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -4,7 +4,8 @@
icon_state = "tonguenormal"
zone = BODY_ZONE_PRECISE_MOUTH
slot = ORGAN_SLOT_TONGUE
- attack_verb = list("licked", "slobbered", "slapped", "frenched", "tongued")
+ attack_verb_continuous = list("licks", "slobbers", "slaps", "frenches", "tongues")
+ attack_verb_simple = list("lick", "slobber", "slap", "french", "tongue")
var/list/languages_possible
var/say_mod = "says"
var/ask_mod = "asks"
@@ -218,7 +219,8 @@
desc = "Apparently skeletons alter the sounds they produce through oscillation of their teeth, hence their characteristic rattling."
icon_state = "tonguebone"
say_mod = "rattles"
- attack_verb = list("bitten", "chattered", "chomped", "enamelled", "boned")
+ attack_verb_continuous = list("bites", "chatters", "chomps", "enamelles", "bones")
+ attack_verb_simple = list("bite", "chatter", "chomp", "enamel", "bone")
taste_sensitivity = 101 // skeletons cannot taste anything
modifies_speech = TRUE
liked_food = GROSS | MEAT | RAW | GORE
@@ -256,7 +258,8 @@
organ_flags = NONE
icon_state = "tonguerobot"
say_mod = "states"
- attack_verb = list("beeped", "booped")
+ attack_verb_continuous = list("beeps", "boops")
+ attack_verb_simple = list("beep", "boop")
modifies_speech = TRUE
taste_sensitivity = 25 // not as good as an organic tongue
@@ -292,7 +295,8 @@
desc = "A sophisticated ethereal organ, capable of synthesising speech via electrical discharge."
icon_state = "electrotongue"
say_mod = "crackles"
- attack_verb = list("shocked", "jolted", "zapped")
+ attack_verb_continuous = list("shocks", "jolts", "zaps")
+ attack_verb_simple = list("shock", "jolt", "zap")
taste_sensitivity = 101 // Not a tongue, they can't taste shit
toxic_food = NONE
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index aa65fb0d06b71..d6bae900fb7ba 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -35,7 +35,8 @@
custom_materials = list(/datum/material/iron=5000, /datum/material/glass=2500)
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_TINY
- attack_verb = list("attacked", "pinched")
+ attack_verb_continuous = list("attacks", "pinches")
+ attack_verb_simple = list("attack", "pinch")
tool_behaviour = TOOL_HEMOSTAT
toolspeed = 1
@@ -49,7 +50,8 @@
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_TINY
toolspeed = 0.5
- attack_verb = list("attacked", "pinched")
+ attack_verb_continuous = list("attacks", "pinches")
+ attack_verb_simple = list("attack", "pinch")
/obj/item/cautery
@@ -63,7 +65,8 @@
custom_materials = list(/datum/material/iron=2500, /datum/material/glass=750)
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_TINY
- attack_verb = list("burnt")
+ attack_verb_continuous = list("burns")
+ attack_verb_simple = list("burn")
tool_behaviour = TOOL_CAUTERY
toolspeed = 1
@@ -77,7 +80,8 @@
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_TINY
toolspeed = 0.5
- attack_verb = list("burnt")
+ attack_verb_continuous = list("burns")
+ attack_verb_simple = list("burn")
/obj/item/blood_filter
@@ -90,7 +94,8 @@
custom_materials = list(/datum/material/iron=2000, /datum/material/glass=1500, /datum/material/silver=500)
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("pumps", "siphons")
+ attack_verb_continuous = list("pumps", "siphons")
+ attack_verb_simple = list("pump", "siphon")
tool_behaviour = TOOL_BLOODFILTER
toolspeed = 1
@@ -107,7 +112,8 @@
flags_1 = CONDUCT_1
force = 15
w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("drilled")
+ attack_verb_continuous = list("drills")
+ attack_verb_simple = list("drill")
tool_behaviour = TOOL_DRILL
toolspeed = 1
@@ -129,7 +135,8 @@
force = 10
w_class = WEIGHT_CLASS_SMALL
toolspeed = 0.5
- attack_verb = list("drilled")
+ attack_verb_continuous = list("drills")
+ attack_verb_simple = list("drill")
/obj/item/scalpel
@@ -147,7 +154,8 @@
throw_speed = 3
throw_range = 5
custom_materials = list(/datum/material/iron=4000, /datum/material/glass=1000)
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP_ACCURATE
bleed_force = BLEED_CUT
@@ -170,7 +178,8 @@
throw_speed = 3
throw_range = 5
custom_materials = list(/datum/material/iron=4000, /datum/material/glass=1000)
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
toolspeed = 0.5
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP_ACCURATE
@@ -196,7 +205,8 @@
throw_speed = 2
throw_range = 5
custom_materials = list(/datum/material/iron=10000, /datum/material/glass=6000)
- attack_verb = list("attacked", "slashed", "sawed", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "saws", "cuts")
+ attack_verb_simple = list("attack", "slash", "saw", "cut")
sharpness = IS_SHARP
bleed_force = BLEED_DEEP_WOUND
tool_behaviour = TOOL_SAW
@@ -221,7 +231,8 @@
throw_range = 5
custom_materials = list(/datum/material/iron=10000, /datum/material/glass=6000)
toolspeed = 0.5
- attack_verb = list("attacked", "slashed", "sawed", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "saws", "cuts")
+ attack_verb_simple = list("attack", "slash", "saw", "cut")
sharpness = IS_SHARP
bleed_force = BLEED_DEEP_WOUND
@@ -239,7 +250,8 @@
force = 7
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=12000)
- attack_verb = list("attacked", "slashed", "sawed", "cut")
+ attack_verb_continuous = list("attacks", "slashes", "saws", "cuts")
+ attack_verb_simple = list("attack", "slash", "saw", "cut")
sharpness = IS_SHARP
tool_behaviour = TOOL_SAW
toolspeed = 2
@@ -257,7 +269,8 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
item_state = "drapes"
w_class = WEIGHT_CLASS_TINY
- attack_verb = list("slapped")
+ attack_verb_continuous = list("slaps")
+ attack_verb_simple = list("slap")
/obj/item/surgical_drapes/attack(mob/living/M, mob/user)
attempt_initiate_surgery(src, M, user)
diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm
index 6c811227b11ed..99b4935f11291 100644
--- a/code/modules/vehicles/mecha/mecha_defense.dm
+++ b/code/modules/vehicles/mecha/mecha_defense.dm
@@ -74,7 +74,7 @@
/obj/vehicle/sealed/mecha/attack_animal(mob/living/simple_animal/user)
log_message("Attack by simple animal. Attacker - [user].", LOG_MECHA, color="red")
if(!user.melee_damage && !user.obj_damage)
- user.emote("custom", message = "[user.friendly] [src].")
+ user.emote("custom", message = "[user.friendly_verb_continuous] [src].")
return 0
else
var/play_soundeffect = 1
diff --git a/code/modules/xenoarchaeology/traits/xenoartifact_malfunctions.dm b/code/modules/xenoarchaeology/traits/xenoartifact_malfunctions.dm
index 9834d24c07c9c..8c9847a3b6a27 100644
--- a/code/modules/xenoarchaeology/traits/xenoartifact_malfunctions.dm
+++ b/code/modules/xenoarchaeology/traits/xenoartifact_malfunctions.dm
@@ -189,14 +189,12 @@
mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
speak_chance = 0
turns_per_move = 5
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
maxHealth = 10
health = 10
melee_damage = 5
- attacktext = "punches"
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HARM
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/xenoarchaeology/traits/xenoartifact_minors.dm b/code/modules/xenoarchaeology/traits/xenoartifact_minors.dm
index eefe2027c1ed3..72e6e12c13f01 100644
--- a/code/modules/xenoarchaeology/traits/xenoartifact_minors.dm
+++ b/code/modules/xenoarchaeology/traits/xenoartifact_minors.dm
@@ -83,7 +83,8 @@
X.sharpness = IS_SHARP_ACCURATE
X.bleed_force = BLEED_CUT
X.force = X.charge_req*0.12
- X.attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut")
+ X.attack_verb_continuous = list("cleaves", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ X.attack_verb_simple = list("cleave", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
X.attack_weight = 2
X.armour_penetration = 5