[N.name], "
var/atom/disk_loc = N.loc
while(!isturf(disk_loc))
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index a20b905b590d..ae651cf055e6 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -259,8 +259,8 @@
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET)
H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
- H.put_in_hands(new /obj/item/claymore(H), TRUE)
- H.equip_to_slot_or_del(new /obj/item/spear(H), ITEM_SLOT_BACK)
+ H.put_in_hands(new /obj/item/melee/sword/claymore(H), TRUE)
+ H.equip_to_slot_or_del(new /obj/item/melee/spear(H), ITEM_SLOT_BACK)
/obj/item/voodoo
diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm
index 69ff4bcfc2f5..9f4349a2bbc8 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook.dm
@@ -351,16 +351,6 @@
limit = 3
category = "Assistance"
-/datum/spellbook_entry/item/mjolnir
- name = "Mjolnir"
- desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power."
- item_path = /obj/item/mjollnir
-
-/datum/spellbook_entry/item/singularity_hammer
- name = "Singularity Hammer"
- desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everything nearby to the point of impact."
- item_path = /obj/item/singularityhammer
-
/datum/spellbook_entry/item/battlemage
name = "Battlemage Armour"
desc = "An ensorceled suit of armour, protected by a powerful shield. The shield can completely negate sixteen attacks before being permanently depleted."
diff --git a/code/modules/autowiki/pages/techweb.dm b/code/modules/autowiki/pages/techweb.dm
index 0f4b87f9e2a2..42e58dd1cc66 100644
--- a/code/modules/autowiki/pages/techweb.dm
+++ b/code/modules/autowiki/pages/techweb.dm
@@ -9,9 +9,6 @@
if (!node.show_on_wiki)
continue
- if (!valid_node(node))
- continue
-
output += "\n\n" + include_template("Autowiki/TechwebEntry", list(
"name" = escape_value(node.display_name),
"description" = escape_value(node.description),
@@ -21,9 +18,6 @@
return output
-/datum/autowiki/techweb/proc/valid_node(datum/techweb_node/node)
- return !node.experimental
-
/datum/autowiki/techweb/proc/generate_designs(list/design_ids)
var/output = ""
@@ -50,9 +44,6 @@
/datum/autowiki/techweb/experimental
page = "Template:Autowiki/Content/Techweb/Experimental"
-/datum/autowiki/techweb/experimental/valid_node(datum/techweb_node/node)
- return node.experimental
-
/proc/sort_research_nodes(node_id_a, node_id_b)
var/datum/techweb_node/node_a = SSresearch.techweb_nodes[node_id_a]
var/datum/techweb_node/node_b = SSresearch.techweb_nodes[node_id_b]
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 42d7643fb926..5fc667c4db4a 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -195,10 +195,10 @@
/obj/machinery/capture_the_flag/Initialize()
. = ..()
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
/obj/machinery/capture_the_flag/Destroy()
- GLOB.poi_list.Remove(src)
+ SSpoints_of_interest.remove_point_of_interest(src)
return ..()
/obj/machinery/capture_the_flag/process()
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 0bf0b74c715a..26361b99cfc6 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -61,11 +61,11 @@
if(instant || (roundstart && (mapload || (SSticker && SSticker.current_state > GAME_STATE_SETTING_UP))))
INVOKE_ASYNC(src, PROC_REF(create))
else if(ghost_usable)
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
LAZYADD(GLOB.mob_spawners[name], src)
/obj/effect/mob_spawn/Destroy()
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
var/list/spawners = GLOB.mob_spawners[name]
LAZYREMOVE(spawners, src)
if(!LAZYLEN(spawners))
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 3c4537caabab..0f76623f617c 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -507,9 +507,7 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonheavy
name = "dungeon heavy"
- loot = list(/obj/item/singularityhammer = 25,
- /obj/item/mjollnir = 10,
- /obj/item/fireaxe = 25,
+ loot = list(/obj/item/melee/axe/fire = 25,
/obj/item/organ/brain/alien = 17,
/obj/item/dualsaber = 15,
/obj/item/organ/heart/demon = 7,
@@ -530,7 +528,7 @@
loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10,
/obj/item/toy/snowball = 15,
/obj/item/shovel = 10,
- /obj/item/spear = 8,
+ /obj/item/melee/spear = 8,
)
//special items//--
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
index 47f7fd884993..d5489edeb3e0 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
@@ -271,3 +271,25 @@
stock_min = 2
stock_max = 10
availability_prob = 10
+
+/datum/blackmarket_item/ammo/c38hotshot
+ name = ".38 Hearth Ammo Box"
+ desc = "We got our ship cook to marinade some .38 in some hearthwine we pocketed off some hunters. It'll cook your targets to a nice well done."
+ item = /obj/item/ammo_box/c38/hotshot
+
+ price_min = 300
+ price_max = 500
+ stock_min = 3
+ stock_max = 8
+ availability_prob = 50
+
+/datum/blackmarket_item/ammo/c38iceblox
+ name = ".38 Chilled Ammo Box"
+ desc = "One of our runners accidentally spilled some .38 into a fucking pristine icewine shipment. It'll freeze your targets faster than our runner froze solid outside for making a mess."
+ item = /obj/item/ammo_box/c38/iceblox
+
+ price_min = 300
+ price_max = 500
+ stock_min = 3
+ stock_max = 8
+ availability_prob = 50
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index d049589fe40a..7a9803085ab8 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -264,7 +264,7 @@
price_min = 1500
price_max = 2500
- stock = 1
+ stock_max = 3
availability_prob = 30
/datum/blackmarket_item/clothing/frontiersmen_hardsuit
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index eb16758b103b..cd0fcf9fd7a9 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -15,7 +15,7 @@
/datum/blackmarket_item/weapon/bone_spear
name = "Bone Spear"
desc = "Authentic tribal spear, made from real bones! A steal at any price, especially if you're a caveman."
- item = /obj/item/spear/bonespear
+ item = /obj/item/melee/spear/bone
price_min = 200
price_max = 300
@@ -25,7 +25,7 @@
/datum/blackmarket_item/weapon/switchblade
name = "Switchblade"
desc = "Extra shrap switchblades for intimidation AND style. Bandages not included if you cut yourself."
- item = /obj/item/kitchen/knife/switchblade
+ item = /obj/item/melee/knife/switchblade
price_min = 500
price_max = 700
diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm
index 3ddc15dfa33b..37507132a865 100644
--- a/code/modules/cargo/bounties/assistant.dm
+++ b/code/modules/cargo/bounties/assistant.dm
@@ -15,7 +15,7 @@
name = "Skateboard"
description = "Nanotrasen has determined walking to be wasteful. Ship a skateboard to CentCom to speed operations up."
reward = 900 // the tony hawk
- wanted_types = list(/obj/vehicle/ridden/scooter/skateboard, /obj/item/melee/skateboard)
+ wanted_types = list(/obj/vehicle/ridden/scooter/skateboard, /obj/item/skateboard)
/datum/bounty/item/assistant/stunprod
name = "Stunprod"
@@ -35,7 +35,7 @@
description = "CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears."
reward = 2000
required_count = 5
- wanted_types = list(/obj/item/spear)
+ wanted_types = list(/obj/item/melee/spear)
/datum/bounty/item/assistant/toolbox
name = "Toolboxes"
diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm
index 4eb48b09c7cb..6527228f31ec 100644
--- a/code/modules/cargo/bounties/mining.dm
+++ b/code/modules/cargo/bounties/mining.dm
@@ -22,7 +22,7 @@
name = "Bone Axe"
description = "Station 12 has had their fire axes stolen by marauding clowns. Ship them a bone axe as a replacement."
reward = 7500
- wanted_types = list(/obj/item/fireaxe/boneaxe)
+ wanted_types = list(/obj/item/melee/axe/bone)
/datum/bounty/item/mining/bone_armor
name = "Bone Armor"
@@ -48,7 +48,7 @@
description = "Central Command's canteen is undergoing budget cuts. Ship over some bone daggers so our Chef can keep working."
reward = 5000
required_count = 3
- wanted_types = list(/obj/item/kitchen/knife/combat/bone)
+ wanted_types = list(/obj/item/melee/knife/bone)
/datum/bounty/item/mining/polypore_mushroom
name = "Mushroom Bowl"
diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index dfec659e1644..0b302925e10e 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -383,7 +383,7 @@
if (specificTarget)
specificTarget = null
return
- var/list/mobs = getpois()//code stolen from observer.dm
+ var/list/mobs = SSpoints_of_interest.get_mob_pois()
var/inputTarget = input("Select a mob! (Smiting does this automatically)", "Target", null, null) as null|anything in mobs
if (isnull(inputTarget))
return
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index 4779886622a4..3ca8ec9ece05 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -9,9 +9,7 @@
/obj/item/book_of_babel,
/obj/item/wisp_lantern,
/obj/item/reagent_containers/glass/bottle/potion/flight,
- /obj/item/katana/cursed,
/obj/item/clothing/glasses/godeye,
- /obj/item/melee/ghost_sword,
/obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/voodoo,
/obj/item/grenade/clusterbuster/inferno,
@@ -22,9 +20,7 @@
/obj/item/lava_staff,
/obj/item/ship_in_a_bottle,
/obj/item/clothing/shoes/clown_shoes/banana_shoes,
- /obj/item/kitchen/knife/envy,
/obj/item/veilrender/vealrender,
- /obj/item/nullrod/scythe/talking/necro,
/obj/item/clothing/suit/armor/ascetic)
/datum/export/lavaland/major //valuable chest/ruin loot and staff of storms
diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm
index bbe73991f7ef..c6ee67ed091e 100644
--- a/code/modules/cargo/exports/weapons.dm
+++ b/code/modules/cargo/exports/weapons.dm
@@ -13,7 +13,7 @@
/datum/export/weapon/knife
cost = 100
unit_name = "combat knife"
- export_types = list(/obj/item/kitchen/knife/combat)
+ export_types = list(/obj/item/melee/knife/combat)
/datum/export/weapon/taser
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index 6fa0b54966c1..a7ab407b428e 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -72,6 +72,18 @@
cost = 500
contains = list(/obj/item/ammo_box/a12g/slug)
+/datum/supply_pack/ammo/blank_shells
+ name = "Blank Shell Crate"
+ desc = "Contains a box of blank shells."
+ cost = 500
+ contains = list(/obj/item/ammo_box/a12g/blanks)
+
+/datum/supply_pack/ammo/blank_ammo_disk
+ name = "Blank Ammo Design Disk Crate"
+ desc = "Run your own training drills!"
+ cost = 1000
+ contains = list(/obj/item/disk/design_disk/blanks)
+
/datum/supply_pack/ammo/techshells
name = "Unloaded Shotgun Technological Shells Crate"
desc = "Contains a box of 7 versatile tech shells, capable of producing a variety of deadly effects for any situation. Some assembly required."
diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm
index 01bfcc1dc756..fd3ba6c74863 100644
--- a/code/modules/cargo/packs/costumes_toys.dm
+++ b/code/modules/cargo/packs/costumes_toys.dm
@@ -115,7 +115,7 @@
if(prob(30)) //Not all mafioso have mustaches, some people also find this item annoying.
new /obj/item/clothing/mask/fakemoustache/italian(C)
if(prob(10)) //A little extra sugar every now and then to shake things up.
- new /obj/item/kitchen/knife/switchblade(C)
+ new /obj/item/melee/knife/switchblade(C)
/datum/supply_pack/costumes_toys/mech_suits
name = "Exosuit Pilot's Suit Crate"
diff --git a/code/modules/cargo/packs/exploration.dm b/code/modules/cargo/packs/exploration.dm
index e88cf65a3931..5f70f2b9c2a1 100644
--- a/code/modules/cargo/packs/exploration.dm
+++ b/code/modules/cargo/packs/exploration.dm
@@ -129,3 +129,14 @@
contains = list(
/obj/item/gps
)
+
+/datum/supply_pack/exploration/flares
+ name = "Flare Supply Pack"
+ desc = "Contains 4 boxes of flares (28 total)! Great for lighting things up."
+ cost = 100
+ contains = list(
+ /obj/item/storage/box/flares,
+ /obj/item/storage/box/flares,
+ /obj/item/storage/box/flares,
+ /obj/item/storage/box/flares,
+ )
diff --git a/code/modules/cargo/packs/material.dm b/code/modules/cargo/packs/material.dm
index 238b6491ea3b..e396854387de 100644
--- a/code/modules/cargo/packs/material.dm
+++ b/code/modules/cargo/packs/material.dm
@@ -112,8 +112,8 @@
crate_name = "wood planks crate"
/datum/supply_pack/material/concrete_mix
- name = "Concrete Mix (Jug)"
- desc = "Feeling lazy? Need a structure and quick? Use concrete! Just add water."
+ name = "Concrete Bag"
+ desc = "Feeling lazy? Need a structure and quick? Use F.O.O.D.'s near-instant concrete mix! Just add water."
cost = 500
- contains = list(/obj/item/reagent_containers/glass/chem_jug/concrete_mix)
+ contains = list(/obj/item/reagent_containers/glass/concrete_bag)
crate_name = "Concrete Mix"
diff --git a/code/modules/cargo/packs/mechs.dm b/code/modules/cargo/packs/mechs.dm
index 7790e696ee15..744e9f67e2f2 100644
--- a/code/modules/cargo/packs/mechs.dm
+++ b/code/modules/cargo/packs/mechs.dm
@@ -220,6 +220,15 @@ Mech Equipment
/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
)
+/datum/supply_pack/mech/equipment/recharger
+ name = "Exosuit Recharger kit"
+ desc = "Two boards for an exosuit recharger and recharger console. For the stylish exosuit bay."
+ cost = 400
+ contains = list(
+ /obj/item/circuitboard/computer/mech_bay_power_console,
+ /obj/item/circuitboard/machine/mech_recharger
+ )
+
/*
weapons
*/
diff --git a/code/modules/cargo/packs/sec_supply.dm b/code/modules/cargo/packs/sec_supply.dm
index 28f15b583206..f0f062160c79 100644
--- a/code/modules/cargo/packs/sec_supply.dm
+++ b/code/modules/cargo/packs/sec_supply.dm
@@ -72,11 +72,24 @@
name = "Survival Knives Crate"
desc = "Contains three sharpened survival knives. Each knife guaranteed to fit snugly inside any galactic-standard boot."
cost = 500
- contains = list(/obj/item/kitchen/knife/combat/survival,
- /obj/item/kitchen/knife/combat/survival,
- /obj/item/kitchen/knife/combat/survival)
+ contains = list(/obj/item/melee/knife/survival,
+ /obj/item/melee/knife/survival,
+ /obj/item/melee/knife/survival)
crate_name = "combat knife crate"
+/*
+/datum/supply_pack/sec_supply/machete
+ name = "Stampted Steel Machete Crate"
+ desc = "Contains five mass produced machetes. A perfect choice for crews on a budget."
+ cost = 500
+ contains = list(/obj/item/melee/sword/mass,
+ /obj/item/melee/sword/mass,
+ /obj/item/melee/sword/mass,
+ /obj/item/melee/sword/mass,
+ /obj/item/melee/sword/mass)
+ crate_name = "combat knife crate"
+*/
+
/datum/supply_pack/sec_supply/fire
name = "Incendiary Weapons Crate"
desc = "Burn, baby burn. Contains three incendiary grenades and three prebuilt flamethrowers."
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index c532202a3df3..6bb58bb2b4e5 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -4,7 +4,7 @@
icon_state = "balaclava"
item_state = "balaclava"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
+ visor_flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
actions_types = list(/datum/action/item_action/adjust)
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index d68c49e61778..8401455bf7d8 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -44,7 +44,7 @@
suit = pickweight(list(
/obj/item/clothing/suit/armor/vest = 5,
/obj/item/clothing/suit/armor/vest/bulletproof/frontier = 5,
- /obj/item/clothing/suit/armor/vest/scrap_armor = 1))
+ /obj/item/clothing/suit/armor/vest/scrap = 1))
if(prob(30))
mask = pickweight(list(
@@ -123,9 +123,9 @@
/obj/item/gun/energy/e_gun/mini))
if("Melee")
r_hand = pickweight(list(
- /obj/item/kitchen/knife/combat/survival = 15,
+ /obj/item/melee/knife/survival = 15,
/obj/item/melee/baseball_bat = 10,
- /obj/item/melee/roastingstick = 2,
+ /obj/item/roastingstick = 2,
/obj/item/kitchen/fork = 1,
/obj/item/melee/flyswatter = 1,
))
@@ -173,14 +173,14 @@
suit = /obj/item/clothing/suit/armor/frontier
suit_store = /obj/item/gun/ballistic/automatic/pistol/deagle
- backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/m50=2, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/m50=2, /obj/item/binoculars=1, /obj/item/melee/knife/survival)
/datum/outfit/job/frontiersmen/ert/leader/unnarmed
name = "ERT - Frontiersman Officer (Unnarmed)"
suit_store = null
- backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/binoculars=1, /obj/item/melee/knife/survival)
/datum/outfit/job/frontiersmen/ert/medic
name = "ERT - Frontiersman Medic"
diff --git a/code/modules/clothing/outfits/ert/indie_ert.dm b/code/modules/clothing/outfits/ert/indie_ert.dm
index e45f0895d0f4..236f9ee75c57 100644
--- a/code/modules/clothing/outfits/ert/indie_ert.dm
+++ b/code/modules/clothing/outfits/ert/indie_ert.dm
@@ -75,7 +75,7 @@
jobtype = /datum/job/chief_engineer
job_icon = "chiefengineer"
- back = /obj/item/fireaxe
+ back = /obj/item/melee/axe/fire
suit = /obj/item/clothing/suit/space/hardsuit/engine
suit_store = /obj/item/tank/internals/oxygen/red
head = null
diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm
index b3fc0c61970c..9fd796d04516 100644
--- a/code/modules/clothing/outfits/ert/inteq_ert.dm
+++ b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -15,7 +15,7 @@
belt = /obj/item/storage/belt/security/webbing/inteq/skm
back = /obj/item/storage/backpack/fireproof
- l_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/melee/knife/combat
r_pocket = /obj/item/flashlight/seclite
backpack_contents = list(/obj/item/radio=1)
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index 482777814c64..d5a3ec72e94c 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -9,7 +9,7 @@
head = /obj/item/clothing/head/helmet/riot/clip
belt = /obj/item/storage/belt/military/clip/cm15
glasses = /obj/item/clothing/glasses/hud/health/night
- r_pocket = /obj/item/kitchen/knife/combat
+ r_pocket = /obj/item/melee/knife/combat
l_pocket = /obj/item/extinguisher/mini
backpack_contents = list(
diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
index a66ee78c7239..1ca40cd640e3 100644
--- a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
+++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
@@ -29,7 +29,7 @@
belt = /obj/item/storage/belt/security/full
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
/obj/item/melee/baton/loaded=1)
- l_pocket = /obj/item/kitchen/knife/switchblade
+ l_pocket = /obj/item/melee/knife/switchblade
/datum/outfit/centcom/ert/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -287,7 +287,7 @@
)
belt = /obj/item/storage/belt/military/assault
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
- l_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/melee/knife/combat
r_pocket = /obj/item/tank/internals/emergency_oxygen/double
uniform = /obj/item/clothing/under/rank/security/officer/military
accessory = /obj/item/clothing/accessory/holster/marine
@@ -399,7 +399,7 @@
box = /obj/item/storage/box/survival/security
l_pocket = /obj/item/restraints/handcuffs
- r_pocket = /obj/item/kitchen/knife/combat
+ r_pocket = /obj/item/melee/knife/combat
backpack_contents = list(/obj/item/radio=1, /obj/item/stock_parts/cell/gun/upgraded=2, /obj/item/screwdriver=1)
diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm
index f2dadc4e0d95..c37dab500091 100644
--- a/code/modules/clothing/outfits/ert/syndicate_ert.dm
+++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm
@@ -14,7 +14,7 @@
back = /obj/item/storage/backpack/security
belt = /obj/item/storage/belt/military/c20r
- r_pocket = /obj/item/kitchen/knife/combat
+ r_pocket = /obj/item/melee/knife/combat
l_pocket = /obj/item/grenade/frag
implants = list(/obj/item/implant/weapons_auth)
@@ -75,7 +75,7 @@
belt = /obj/item/storage/belt/security
suit_store = /obj/item/gun/ballistic/automatic/marksman/taipan
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
l_pocket = /obj/item/binoculars
backpack_contents = list(/obj/item/ammo_box/magazine/sniper_rounds=2, /obj/item/radio=1)
@@ -133,7 +133,7 @@
head = /obj/item/clothing/head/soft/cybersun/medical
belt = /obj/item/storage/belt/medical/webbing/paramedic
back = /obj/item/storage/backpack/ert/medical
- l_pocket = /obj/item/kitchen/knife/combat/survival
+ l_pocket = /obj/item/melee/knife/survival
r_pocket = /obj/item/pinpointer/crew
accessory = /obj/item/clothing/accessory/holster/marine
diff --git a/code/modules/clothing/outfits/factions/frontiersmen.dm b/code/modules/clothing/outfits/factions/frontiersmen.dm
index 44d0c4920784..997eec2209d4 100644
--- a/code/modules/clothing/outfits/factions/frontiersmen.dm
+++ b/code/modules/clothing/outfits/factions/frontiersmen.dm
@@ -133,7 +133,7 @@
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/beret/sec/frontier/officer
gloves = /obj/item/clothing/gloves/combat
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
// Head of Security
/datum/outfit/job/frontiersmen/hos
@@ -184,7 +184,7 @@
accessory = /obj/item/clothing/accessory/armband/med
uniform = /obj/item/clothing/under/frontiersmen
glasses = /obj/item/clothing/glasses/hud/health
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
suit = /obj/item/clothing/suit/frontiersmen
head = /obj/item/clothing/head/frontier
belt = /obj/item/storage/belt/medical/webbing/frontiersmen
diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm
index e9b783de9780..2b93739fb0f9 100644
--- a/code/modules/clothing/outfits/factions/independent.dm
+++ b/code/modules/clothing/outfits/factions/independent.dm
@@ -53,7 +53,7 @@
uniform = /obj/item/clothing/under/utility
head = /obj/item/clothing/head/soft/black
shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat/survival
+ l_pocket = /obj/item/melee/knife/survival
gloves = /obj/item/clothing/gloves/combat
implants = list(/obj/item/implant/radio)
@@ -145,7 +145,7 @@
suit = /obj/item/clothing/suit/armor/vest/marine/medium
head = /obj/item/clothing/head/soft/black
shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/melee/knife/combat
implants = list(/obj/item/implant/radio)
accessory = null
@@ -298,7 +298,7 @@
uniform = /obj/item/clothing/under/utility
head = /obj/item/clothing/head/soft/black
shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/melee/knife/combat
backpack_contents = list(/obj/item/melee/baton/loaded=1)
@@ -349,7 +349,7 @@
uniform = /obj/item/clothing/under/utility
head = /obj/item/clothing/head/soft/black
shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat/survival
+ l_pocket = /obj/item/melee/knife/survival
gloves = /obj/item/clothing/gloves/color/red/insulated
implants = list(/obj/item/implant/radio)
@@ -572,7 +572,7 @@
l_pocket = /obj/item/storage/bag/ore
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
- /obj/item/kitchen/knife/combat/survival=1,\
+ /obj/item/melee/knife/survival=1,\
/obj/item/stack/marker_beacon/ten=1,\
/obj/item/radio/weather_monitor=1)
diff --git a/code/modules/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm
index b22c69b38f6b..e292a6e61d03 100644
--- a/code/modules/clothing/outfits/factions/nanotrasen.dm
+++ b/code/modules/clothing/outfits/factions/nanotrasen.dm
@@ -316,7 +316,7 @@
backpack_contents = list(
/obj/item/flashlight/seclite=1,
- /obj/item/kitchen/knife/combat/survival=1,
+ /obj/item/melee/knife/survival=1,
/obj/item/stack/marker_beacon/ten=1,
/obj/item/radio/weather_monitor=1,
)
@@ -569,7 +569,7 @@
backpack = /obj/item/storage/backpack/ert/security
belt = /obj/item/storage/belt/military
id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
/datum/outfit/job/nanotrasen/security/ert/engi
@@ -580,7 +580,7 @@
backpack = /obj/item/storage/backpack/ert/engineer
belt = /obj/item/storage/belt/utility/full/ert
id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
accessory = /obj/item/clothing/accessory/armband/engine
glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
@@ -593,7 +593,7 @@
backpack = /obj/item/storage/backpack/ert/medical
belt = /obj/item/storage/belt/medical/webbing/paramedic
id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
accessory = /obj/item/clothing/accessory/armband/med
glasses = /obj/item/clothing/glasses/hud/health/night
diff --git a/code/modules/clothing/outfits/factions/solgov.dm b/code/modules/clothing/outfits/factions/solgov.dm
index 3b14fc89dafa..c4aed59c7e21 100644
--- a/code/modules/clothing/outfits/factions/solgov.dm
+++ b/code/modules/clothing/outfits/factions/solgov.dm
@@ -101,7 +101,7 @@
implants = list(/obj/item/implant/mindshield)
backpack_contents = list(
- /obj/item/kitchen/knife/letter_opener = 1
+ /obj/item/melee/knife/letter_opener = 1
)
/datum/outfit/job/solgov/overseer
@@ -159,7 +159,7 @@
r_pocket = /obj/item/storage/bag/ore //causes issues if spawned in backpack
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
- /obj/item/kitchen/knife/combat/survival=1,\
+ /obj/item/melee/knife/survival=1,\
/obj/item/stack/marker_beacon/ten=1)
backpack = /obj/item/storage/backpack/explorer
diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm
index 269b476ccd91..1d91a94b766d 100644
--- a/code/modules/clothing/outfits/factions/syndicate.dm
+++ b/code/modules/clothing/outfits/factions/syndicate.dm
@@ -516,7 +516,7 @@
head = /obj/item/clothing/head/HoS/beret/syndicate
gloves = /obj/item/clothing/gloves/color/white
id = /obj/item/card/id/syndicate_command/crew_id
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
glasses = /obj/item/clothing/glasses/hud/health
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
@@ -532,7 +532,7 @@
head = /obj/item/clothing/head/HoS/cybersun
gloves = /obj/item/clothing/gloves/combat
id = /obj/item/card/id/syndicate_command/crew_id
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
glasses = /obj/item/clothing/glasses/sunglasses
/datum/outfit/job/syndicate/head_of_personnel/suns
@@ -634,7 +634,7 @@
uniform = /obj/item/clothing/under/syndicate/suns/pkuniform
suit = /obj/item/clothing/suit/armor/vest/suns/hos
- belt = /obj/item/melee/sabre/suns/telescopic
+ belt = /obj/item/melee/sword/sabre/suns/telescopic
gloves = /obj/item/clothing/gloves/tackler/dolphin/suns
shoes = /obj/item/clothing/shoes/combat/suns
head = /obj/item/clothing/head/welding/suns/hos
@@ -711,7 +711,7 @@
head = /obj/item/clothing/head/hardliners
suit = /obj/item/clothing/suit/hardliners
glasses = /obj/item/clothing/glasses/hud/health
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
back = /obj/item/storage/backpack/duffelbag/syndie/med
id = /obj/item/card/id/syndicate_command/crew_id
backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,)
@@ -723,7 +723,7 @@
head = /obj/item/clothing/head/ngr/surgical
suit = /obj/item/clothing/suit/ngr/smock
glasses = /obj/item/clothing/glasses/hud/health
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
back = /obj/item/storage/backpack/duffelbag/syndie/med
id = /obj/item/card/id/syndicate_command/crew_id
backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,)
@@ -897,7 +897,7 @@
job_icon = "securityofficer"
uniform = /obj/item/clothing/under/syndicate
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
belt = /obj/item/storage/belt/military
back = /obj/item/storage/backpack
suit = /obj/item/clothing/suit/armor/vest
@@ -994,7 +994,7 @@
uniform = /obj/item/clothing/under/syndicate/suns/pkuniform
suit = /obj/item/clothing/suit/armor/vest/suns
alt_suit = /obj/item/clothing/suit/toggle/suns/pkcoat
- belt = /obj/item/melee/sabre/suns/telescopic
+ belt = /obj/item/melee/sword/sabre/suns/telescopic
gloves = /obj/item/clothing/gloves/tackler/dolphin/suns
shoes = /obj/item/clothing/shoes/jackboots/suns/long
head = /obj/item/clothing/head/welding/suns
@@ -1020,7 +1020,7 @@
r_pocket = /obj/item/storage/bag/ore
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
- /obj/item/kitchen/knife/combat/survival=1,\
+ /obj/item/melee/knife/survival=1,\
/obj/item/mining_voucher=1,\
/obj/item/stack/marker_beacon/ten=1)
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 100cc7ff0f52..1754e84c7e8e 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -102,7 +102,6 @@
uniform = /obj/item/clothing/under/color/black/ghost
suit = /obj/item/clothing/suit/hooded/cultrobes/alt/ghost
shoes = /obj/item/clothing/shoes/cult/alt/ghost
- r_hand = /obj/item/melee/cultblade/ghost
/datum/outfit/wizard
name = "Blue Wizard"
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 67dc7ce529b3..6e825e48ea4b 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -36,7 +36,7 @@ Contains:
desc = "A prototype designed to replace the ageing MK.II SWAT suit. Based on the streamlined MK.II model, the traditional ceramic and graphene plate construction was replaced with plasteel, allowing superior armor against most threats. There's room for some kind of energy projection device on the back."
icon_state = "deathsquad"
item_state = "swat_suit"
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/knife/combat)
armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 60, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
strip_delay = 130
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
@@ -50,7 +50,7 @@ Contains:
desc = "A tactical space suit first developed in a joint effort by the defunct IS-ERI and Nanotrasen in 20XX for military space operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!"
icon_state = "heavy"
item_state = "swat_suit"
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/knife/combat)
armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100)
strip_delay = 120
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -363,7 +363,7 @@ Contains:
armor = list("melee" = 30, "bullet" = 10, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 10, "fire" = 100, "acid" = 100)
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife, /obj/item/kinetic_crusher, /obj/item/resonator, /obj/item/melee/transforming/cleaving_saw)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/melee/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kinetic_crusher, /obj/item/resonator, /obj/item/melee/transforming/cleaving_saw)
/obj/item/clothing/suit/space/hardsuit/berserker/RemoveHelmet()
var/obj/item/clothing/head/helmet/space/hardsuit/berserker/helm = helmet
@@ -489,7 +489,7 @@ Contains:
desc = "A custom version of the MK.II SWAT suit, modified to look rugged and tough. Works as a space suit, if you can find a helmet."
icon_state = "hunter"
item_state = "swat_suit"
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/knife/combat)
armor = list("melee" = 60, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
strip_delay = 130
resistance_flags = FIRE_PROOF | ACID_PROOF
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index a16680353b6f..b9eb2b6d7c53 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -277,7 +277,7 @@
desc = "A classic suit of plate armour, highly effective at stopping melee attacks."
icon_state = "riot_knight_green"
item_state = "riot_knight_green"
- allowed = list(/obj/item/nullrod, /obj/item/claymore, /obj/item/banner, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/melee/sword/claymore, /obj/item/banner, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen, /obj/item/tank/internals/plasmaman)
/obj/item/clothing/suit/armor/riot/knight/yellow
icon_state = "riot_knight_yellow"
@@ -400,13 +400,6 @@
icon_state = "armor_syndie"
item_state = "syndiearmor"
-/obj/item/clothing/suit/armor/vest/scrap_armor
- name = "scrap armor"
- desc = "An 'armor' vest consisting of sheet metal held together with cable. Who thought this was a good idea?"
- icon_state = "scraparmor"
- item_state = "scraparmor"
- armor = list("melee" = 5)
-
/obj/item/clothing/suit/armor/curator
name = "treasure hunter's coat"
desc = "Both fashionable and lightly armoured, this jacket is favoured by treasure hunters the galaxy over."
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 3ef1628c19b4..c62d0e92b8c0 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -98,4 +98,4 @@
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit/Initialize()
. = ..()
- allowed += list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/cane)
+ allowed += list(/obj/item/storage/book/bible, /obj/item/cane)
diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm
index 58802e01b8a1..073966a5fc15 100644
--- a/code/modules/clothing/suits/chaplainsuits.dm
+++ b/code/modules/clothing/suits/chaplainsuits.dm
@@ -1,10 +1,10 @@
//Chaplain Suit Subtypes
//If any new staple chaplain items get added, put them in these lists
/obj/item/clothing/suit/chaplainsuit
- allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/storage/book/bible, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
/obj/item/clothing/suit/hooded/chaplainsuit
- allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/storage/book/bible, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
//Suits
/obj/item/clothing/suit/chaplainsuit/holidaypriest
diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm
index 4e3f6d5e3a9c..763be0e2f468 100644
--- a/code/modules/clothing/suits/cloaks.dm
+++ b/code/modules/clothing/suits/cloaks.dm
@@ -76,7 +76,7 @@
name = "goliath cloak"
icon_state = "goliath_cloak"
desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits."
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/melee/spear, /obj/item/organ/regenerative_core/legion, /obj/item/melee/knife/bone, /obj/item/melee/knife/survival)
armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot
hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath
body_parts_covered = CHEST|GROIN|ARMS
@@ -94,7 +94,7 @@
name = "drake armour"
icon_state = "dragon"
desc = "A suit of armour fashioned from the remains of an ash drake."
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/spear)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/melee/spear)
armor = list("melee" = 50, "bullet" = 10, "laser" = 40, "energy" = 50, "bomb" = 50, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100)
hoodtype = /obj/item/clothing/head/hooded/cloakhood/drake
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 312f14dec507..3b1735208dda 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -278,7 +278,7 @@
hoodtype = /obj/item/clothing/head/hooded/enginseer
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDEGLOVES
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/gun, /obj/item/melee, /obj/item/nullrod, /obj/item/radio, /obj/item/storage/book)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/gun, /obj/item/melee, /obj/item/radio, /obj/item/storage/book)
/obj/item/clothing/head/hooded/enginseer
name = "enginseer's hood"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index f8e8c3f69909..6e8b87b06285 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -132,7 +132,7 @@
item_state = "imperium_monk"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
- allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/book/bible, /obj/item/melee/sword, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
/obj/item/clothing/suit/chickensuit
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index f7710d52a12d..0d05c4e0cf7f 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -137,6 +137,7 @@
icon_state = "bronze"
custom_materials = list(/datum/material/iron=1000)
resistance_flags = FIRE_PROOF
+ attachment_slot = null
var/medaltype = "medal" //Sprite used for medalbox
var/commended = FALSE
@@ -393,7 +394,6 @@
desc = "A legion skull fitted to a codpiece, intended to protect the important things in life."
icon_state = "skull"
above_suit = TRUE
- armor = list("melee" = 10, "bullet" = 10, "laser" = 5, "energy" = 5, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 40, "acid" = 40)
attachment_slot = GROIN
/obj/item/clothing/accessory/skilt
@@ -402,7 +402,6 @@
icon_state = "skilt"
above_suit = TRUE
minimize_when_attached = FALSE
- armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 0, "acid" = 25)
attachment_slot = GROIN
/obj/item/clothing/accessory/holster
@@ -411,6 +410,7 @@
icon_state = "holster"
item_state = "holster"
pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster
+ attachment_slot = null
/obj/item/clothing/accessory/holster/detective
name = "detective's shoulder holster"
@@ -479,7 +479,7 @@
icon_state = "rilena_pin"
above_suit = FALSE
minimize_when_attached = TRUE
- attachment_slot = CHEST
+ attachment_slot = null
/obj/item/clothing/accessory/rilena_pin/on_uniform_equip(obj/item/clothing/under/U, user)
var/mob/living/L = user
diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm
index adde1124935f..4ba2d878ad46 100644
--- a/code/modules/events/immovable_rod.dm
+++ b/code/modules/events/immovable_rod.dm
@@ -62,7 +62,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
z_original = z
destination = end
special_target = aimed_at
- GLOB.poi_list += src
+ SSpoints_of_interest.make_point_of_interest(src)
var/special_target_valid = FALSE
if(special_target)
@@ -81,7 +81,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
ghost.ManualFollow(src)
/obj/effect/immovablerod/Destroy()
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
. = ..()
/obj/effect/immovablerod/Moved()
diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm
deleted file mode 100644
index e99b0d754910..000000000000
--- a/code/modules/events/wizard/curseditems.dm
+++ /dev/null
@@ -1,60 +0,0 @@
-/datum/round_event_control/wizard/cursed_items //fashion disasters
- name = "Cursed Items"
- weight = 3
- typepath = /datum/round_event/wizard/cursed_items
- max_occurrences = 3
- earliest_start = 0 MINUTES
-
-//Note about adding items to this: Because of how NODROP_1 works if an item spawned to the hands can also be equiped to a slot
-//it will be able to be put into that slot from the hand, but then get stuck there. To avoid this make a new subtype of any
-//item you want to equip to the hand, and set its slots_flags = null. Only items equiped to hands need do this.
-
-/datum/round_event/wizard/cursed_items/start()
- var/item_set = pick("wizardmimic", "swords", "bigfatdoobie", "boxing", "voicemodulators", "catgirls2015")
- var/list/loadout[SLOTS_AMT]
- var/ruins_spaceworthiness
- var/ruins_wizard_loadout
-
- switch(item_set)
- if("wizardmimic")
- loadout[ITEM_SLOT_OCLOTHING] = /obj/item/clothing/suit/wizrobe
- loadout[ITEM_SLOT_FEET] = /obj/item/clothing/shoes/sandal/magic
- loadout[ITEM_SLOT_HEAD] = /obj/item/clothing/head/wizard
- ruins_spaceworthiness = 1
- if("swords")
- loadout[ITEM_SLOT_HANDS] = /obj/item/katana/cursed
- if("bigfatdoobie")
- loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/cigarette/rollie/trippy
- ruins_spaceworthiness = 1
- if("boxing")
- loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/luchador
- loadout[ITEM_SLOT_GLOVES] = /obj/item/clothing/gloves/boxing
- ruins_spaceworthiness = 1
- if("voicemodulators")
- loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/chameleon
- if("catgirls2015")
- loadout[ITEM_SLOT_HEAD] = /obj/item/clothing/head/kitty
- ruins_spaceworthiness = 1
- ruins_wizard_loadout = 1
-
- for(var/mob/living/carbon/human/H as anything in GLOB.human_list)
- if(ruins_spaceworthiness && isspaceturf(H.loc) || isplasmaman(H))
- continue //#savetheminers
- if(ruins_wizard_loadout && iswizard(H))
- continue
- if(item_set == "catgirls2015") //Wizard code means never having to say you're sorry
- H.gender = FEMALE
- for(var/i in 1 to loadout.len)
- if(loadout[i])
- var/obj/item/J = loadout[i]
- var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list
- H.dropItemToGround(H.get_item_by_slot(i), TRUE)
- H.equip_to_slot_or_del(I, i)
- ADD_TRAIT(I, TRAIT_NODROP, CURSED_ITEM_TRAIT)
- I.item_flags |= DROPDEL
- I.name = "cursed " + I.name
-
- for(var/mob/living/carbon/human/H as anything in GLOB.human_list)
- var/datum/effect_system/smoke_spread/smoke = new
- smoke.set_up(0, H.loc)
- smoke.start()
diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm
index 890bbc0f1f2b..8e4baab893fc 100644
--- a/code/modules/events/wizard/greentext.dm
+++ b/code/modules/events/wizard/greentext.dm
@@ -34,7 +34,7 @@
/obj/item/greentext/Initialize(mapload)
. = ..()
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
roundend_callback = CALLBACK(src, PROC_REF(check_winner))
SSticker.OnRoundend(roundend_callback)
@@ -83,7 +83,7 @@
if(!(resistance_flags & ON_FIRE) && !force)
return QDEL_HINT_LETMELIVE
- GLOB.poi_list.Remove(src)
+ SSpoints_of_interest.remove_point_of_interest(src)
LAZYREMOVE(SSticker.round_end_events, roundend_callback)
roundend_callback = null //This ought to free the callback datum, and prevent us from harddeling
for(var/i in GLOB.player_list)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 4774ea852424..69c15b1e3494 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -1023,11 +1023,11 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if(prob(25))
target.halitem.icon_state = "plasticx40"
if(3) //sword
- target.halitem.icon = 'icons/obj/transforming_energy.dmi'
+ target.halitem.icon = 'icons/obj/weapon/energy.dmi'
target.halitem.icon_state = "sword0"
target.halitem.name = "Energy Sword"
if(4) //stun baton
- target.halitem.icon = 'icons/obj/items_and_weapons.dmi'
+ target.halitem.icon = 'icons/obj/items.dmi'
target.halitem.icon_state = "stunbaton"
target.halitem.name = "Stun Baton"
if(5) //emag
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 785607cdef67..49de009448f2 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -602,7 +602,7 @@
desc = "Legend says something amazing happens when you collect enough of these."
custom_price = 100
custom_premium_price = 110
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "sandstar"
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/gold = 200)
diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm
index c7bcf963faf2..5ec9408dc414 100644
--- a/code/modules/food_and_drinks/food/snacks_soup.dm
+++ b/code/modules/food_and_drinks/food/snacks_soup.dm
@@ -159,12 +159,12 @@
tastes = list("tomato" = 1, "squirming" = 1)
foodtype = MEAT | GORE
-/obj/item/reagent_containers/food/snacks/soup/milo
- name = "milosoup"
+/obj/item/reagent_containers/food/snacks/soup/miso
+ name = "miso soup"
desc = "The universes best soup! Yum!!!"
- icon_state = "milosoup"
+ icon_state = "misosoup"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
- tastes = list("milo" = 1) // wtf is milo
+ tastes = list("miso" = 1) // wtf is milo
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/soup/mushroom
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index b1191fda7ada..1eb1d255c340 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -265,7 +265,7 @@
/datum/reagent/consumable/milk = 1,
/datum/reagent/consumable/cherryjelly = 5,
/obj/item/stock_parts/cell/super =1,
- /obj/item/melee/sabre = 1
+ /obj/item/melee/sword/sabre = 1
)
result = /obj/item/reagent_containers/food/snacks/powercrepe
subcategory = CAT_MISCFOOD
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
index daf98f0444a4..3443b32e931e 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
@@ -115,15 +115,15 @@
subcategory = CAT_SOUP
-/datum/crafting_recipe/food/milosoup
- name = "Milo soup"
+/datum/crafting_recipe/food/misosoup
+ name = "Miso soup"
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/reagent_containers/food/snacks/soydope = 2,
/obj/item/reagent_containers/food/snacks/tofu = 2
)
- result = /obj/item/reagent_containers/food/snacks/soup/milo
+ result = /obj/item/reagent_containers/food/snacks/soup/miso
subcategory = CAT_SOUP
/datum/crafting_recipe/food/bloodsoup
diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm
index d56fd4f9c32c..c0d985e89d79 100644
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -13,7 +13,7 @@
/obj/item/holo/esword
name = "holographic energy sword"
desc = "May the force be with you. Sorta."
- icon = 'icons/obj/transforming_energy.dmi'
+ icon = 'icons/obj/weapon/energy.dmi'
icon_state = "sword"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
@@ -69,7 +69,7 @@
/obj/item/toy/beach_ball/holoball
name = "basketball"
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "basketball"
item_state = "basketball"
desc = "Here's your chance, do your dance at the Space Jam."
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index f9633ade7661..3fa14561b8d1 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -45,7 +45,7 @@
seed = /obj/item/seeds/nettle
name = "nettle"
desc = "It's probably not wise to touch it with bare hands..."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "nettle"
lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi'
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index 97773e39f277..d3f847d7e292 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -28,7 +28,7 @@
/obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
if(I.get_sharpness())
to_chat(user, "You sharpen the carrot into a shiv with [I].")
- var/obj/item/kitchen/knife/shiv/carrot/Shiv = new /obj/item/kitchen/knife/shiv/carrot
+ var/obj/item/melee/knife/shiv/carrot/Shiv = new /obj/item/melee/knife/shiv/carrot
remove_item_from_storage(user)
qdel(src)
user.put_in_hands(Shiv)
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 74d004849a2a..56ad2264ce01 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -59,7 +59,7 @@
/obj/item/cultivator
name = "cultivator"
desc = "It's used for removing weeds or scratching your back."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "cultivator"
item_state = "cultivator"
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
@@ -106,7 +106,7 @@
/obj/item/hatchet
name = "hatchet"
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/weapon/axe.dmi'
icon_state = "hatchet"
item_state = "hatchet"
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm
index ab4ceb6968c0..5efe0a0a00d2 100644
--- a/code/modules/jobs/job_types/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain.dm
@@ -15,20 +15,6 @@
var/obj/item/storage/book/bible/booze/B = new
- if(GLOB.religion)
- B.deity_name = GLOB.deity
- B.name = GLOB.bible_name
- B.icon_state = GLOB.bible_icon_state
- B.item_state = GLOB.bible_item_state
- to_chat(H, "There is already an established religion onboard the station. You are an acolyte of [GLOB.deity]. Defer to the Chaplain.")
- H.equip_to_slot_or_del(B, ITEM_SLOT_BACKPACK)
- var/nrt = GLOB.holy_weapon_type || /obj/item/nullrod
- var/obj/item/nullrod/N = new nrt(H)
- H.put_in_hands(N)
- if(GLOB.religious_sect)
- GLOB.religious_sect.on_conversion(H)
- return
-
var/new_religion = DEFAULT_RELIGION
if(M.client && M.client.prefs.custom_names["religion"])
new_religion = M.client.prefs.custom_names["religion"]
diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm
index 1469e592b4de..341116d30c8c 100644
--- a/code/modules/jobs/job_types/shaft_miner.dm
+++ b/code/modules/jobs/job_types/shaft_miner.dm
@@ -26,7 +26,7 @@
r_pocket = /obj/item/storage/bag/ore //causes issues if spawned in backpack
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
- /obj/item/kitchen/knife/combat/survival=1,\
+ /obj/item/melee/knife/survival=1,\
/obj/item/stack/marker_beacon/ten=1,\
/obj/item/radio/weather_monitor=1)
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 55d33ee80d20..9c6e90469fcc 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -319,7 +319,7 @@
scanner.computer.inventory.Add(src)
to_chat(user, "[I]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'")
- else if(istype(I, /obj/item/kitchen/knife) || I.tool_behaviour == TOOL_WIRECUTTER)
+ else if(istype(I, /obj/item/melee/knife) || I.tool_behaviour == TOOL_WIRECUTTER)
to_chat(user, "You begin to carve out [title]...")
if(do_after(user, 30, target = src))
to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.")
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index 71de02b3ca1c..38b3728651ce 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -358,7 +358,6 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
return null
/obj/machinery/computer/bookmanagement/proc/print_forbidden_lore(mob/user)
- new /obj/item/melee/cultblade/dagger(get_turf(src))
to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a sinister dagger sitting on the desk. You don't even remember where it came from...")
user.visible_message("[user] stares at the blank screen for a few moments, [user.p_their()] expression frozen in fear. When [user.p_they()] finally awaken[user.p_s()] from it, [user.p_they()] look[user.p_s()] a lot older.", 2)
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 2040764eefb9..251cf46e7c5f 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -280,7 +280,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
//cake + knife to cut it!
if(length(table))
var/turf/food_turf = get_turf(pick(table))
- new /obj/item/kitchen/knife(food_turf)
+ new /obj/item/melee/knife/kitchen(food_turf)
var/obj/item/food/cake/birthday/iancake = new(food_turf)
iancake.desc = "Happy birthday, Ian!"
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index 21bfb509e6fb..ea43fe78f176 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -136,7 +136,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/mask/cigarette/rollie(src)
if(6 to 10)
- new /obj/item/melee/skateboard/pro(src)
+ new /obj/item/skateboard/pro(src)
if(11 to 15)
new /mob/living/simple_animal/bot/honkbot(src)
if(16 to 20)
@@ -211,7 +211,7 @@
for(var/i in 1 to 30)
new /mob/living/simple_animal/hostile/cockroach(src)
if(92)
- new /obj/item/katana(src)
+ new /obj/item/melee/sword/katana(src)
if(93)
new /obj/item/dnainjector/xraymut(src)
if(94)
@@ -220,7 +220,6 @@
if(95)
new /obj/item/toy/plush/nukeplushie(src)
if(96)
- new /obj/item/banhammer(src)
for(var/i in 1 to 3)
new /obj/item/mine/pressure/sound(src)
if(97)
@@ -237,5 +236,5 @@
if(99)
new /obj/item/implanter/sad_trombone(src)
if(100)
- new /obj/item/melee/skateboard/hoverboard(src)
+ new /obj/item/skateboard/hoverboard(src)
spawned_loot = TRUE
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 3b390da34251..b5e112713a82 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -190,3 +190,37 @@
/obj/item/clothing/head/hooded/survivor_hood/Initialize()
. = ..()
AddComponent(/datum/component/armor_plate)
+
+/obj/item/clothing/suit/hooded/scrap
+ name = "scrap suit"
+ desc = "A ragged makeshift suit."
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+ icon_state = "survivor"
+ item_state = "survivor_suit"
+ body_parts_covered = CHEST|GROIN|LEGS|ARMS
+ min_cold_protection_temperature = (FIRE_SUIT_MIN_TEMP_PROTECT * 2)
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ max_heat_protection_temperature = (FIRE_SUIT_MAX_TEMP_PROTECT / 2)
+ heat_protection = CHEST|GROIN|LEGS|ARMS
+ hoodtype = /obj/item/clothing/head/hooded/scrap
+ armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 20, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 30)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals)
+ resistance_flags = FIRE_PROOF
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
+
+/obj/item/clothing/head/hooded/scrap
+ name = "scrap hood"
+ desc = "A loose-fitting hood. It gets the job done."
+ icon_state = "explorerold"
+ suit = /obj/item/clothing/suit/hooded/scrap
+ body_parts_covered = HEAD
+ flags_inv = HIDEHAIR|HIDEEARS
+ armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 20, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 30)
+
+/obj/item/clothing/suit/armor/vest/scrap
+ name = "scrap armor"
+ desc = "An 'armor' vest consisting of sheet metal held together with cable. Who thought this was a good idea?"
+ icon_state = "scraparmor"
+ item_state = "scraparmor"
+ armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 20, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 30)
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 2a38ae896e76..15f7cb2e3a69 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -308,17 +308,16 @@
var/possible = list(/obj/item/ship_in_a_bottle,
/obj/item/gun/energy/pulse,
/obj/item/book/granter/martial/carp,
- /obj/item/melee/supermatter_sword,
+ /obj/item/melee/sword/supermatter,
/obj/item/shield/changeling,
/obj/item/lava_staff,
- /obj/item/energy_katana,
+ /obj/item/melee/sword/energy_katana,
/obj/item/hierophant_club,
/obj/item/gun/energy/minigun,
/obj/item/gun/ballistic/automatic/assault/hydra/lmg/extended,
/obj/item/stack/telecrystal/twenty,
/obj/item/nuke_core,
- /obj/item/phylactery,
- /obj/item/banhammer)
+ /obj/item/phylactery)
/obj/item/fakeartefact/Initialize()
. = ..()
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index f9563cc078eb..bf6fb15c9332 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -419,7 +419,7 @@
/obj/item/seeds/lavaland/puce/attackby(obj/item/item, mob/user, params)
. = ..()
//anyone intending to add more garnishes using this method should componentize this
- if(!istype(item, /obj/item/kitchen/knife))
+ if(!istype(item, /obj/item/melee/knife))
return
playsound(src, 'sound/effects/glassbr1.ogg', 50, TRUE, -1)
to_chat(user, "You start breaking [src] up into shards...")
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 2af5515e47a7..e3e9f6aac8f0 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -21,8 +21,6 @@
new /obj/item/clothing/suit/space/hardsuit/cult(src)
if(3)
new /obj/item/necromantic_stone/lava(src)
- if(4)
- new /obj/item/katana/cursed(src)
if(5)
new /obj/item/clothing/glasses/godeye(src)
if(6)
@@ -47,7 +45,7 @@
new /obj/item/borg/upgrade/modkit/lifesteal(src)
new /obj/item/bedsheet/cult(src)
if(14)
- new /obj/item/nullrod/scythe/talking/necro(src)
+ new /obj/item/scythe(src)
if(15)
new /obj/item/book_of_babel(src)
if(16)
@@ -80,8 +78,6 @@
new /obj/item/gun/energy/spur(src)
if(28)
new /obj/item/clothing/suit/armor/ascetic(src)
- if(29)
- new /obj/item/kitchen/knife/envy(src)
/obj/structure/closet/crate/necropolis/tendril/greater
desc = "It's watching you wearily. It seems terribly bloated."
@@ -96,8 +92,6 @@
new /obj/item/clothing/suit/space/hardsuit/cult(src)
if(3)
new /obj/item/necromantic_stone/lava(src)
- if(4)
- new /obj/item/katana/cursed(src)
if(5)
new /obj/item/clothing/glasses/godeye(src)
if(6)
@@ -122,7 +116,7 @@
new /obj/item/borg/upgrade/modkit/lifesteal(src)
new /obj/item/bedsheet/cult(src)
if(14)
- new /obj/item/nullrod/scythe/talking/necro(src)
+ new /obj/item/scythe(src)
if(15)
new /obj/item/book_of_babel(src)
if(16)
@@ -155,36 +149,6 @@
new /obj/item/gun/energy/spur(src)
if(28)
new /obj/item/clothing/suit/armor/ascetic(src)
- if(29)
- new /obj/item/kitchen/knife/envy(src)
-
-//KA modkit design discs
-/obj/item/disk/design_disk/modkit_disc
- name = "KA Mod Disk"
- desc = "A design disc containing the design for a unique kinetic accelerator modkit. It's compatible with a research console."
- illustration = "accel"
- color = "#6F6F6F"
- var/modkit_design = /datum/design/unique_modkit
-
-/obj/item/disk/design_disk/modkit_disc/Initialize()
- . = ..()
- blueprints[1] = new modkit_design
-
-/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe
- name = "Offensive Mining Explosion Mod Disk"
- modkit_design = /datum/design/unique_modkit/offensive_turf_aoe
-
-/obj/item/disk/design_disk/modkit_disc/rapid_repeater
- name = "Rapid Repeater Mod Disk"
- modkit_design = /datum/design/unique_modkit/rapid_repeater
-
-/obj/item/disk/design_disk/modkit_disc/resonator_blast
- name = "Resonator Blast Mod Disk"
- modkit_design = /datum/design/unique_modkit/resonator_blast
-
-/obj/item/disk/design_disk/modkit_disc/bounty
- name = "Death Syphon Mod Disk"
- modkit_design = /datum/design/unique_modkit/bounty
/datum/design/unique_modkit
category = list("Mining Designs", "Cyborg Upgrade Modules") //can't be normally obtained
@@ -738,8 +702,8 @@
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET)
H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
- H.put_in_hands(new /obj/item/claymore(H), TRUE)
- H.equip_to_slot_or_del(new /obj/item/spear(H), ITEM_SLOT_BACK)
+ H.put_in_hands(new /obj/item/melee/sword/claymore(H), TRUE)
+ H.equip_to_slot_or_del(new /obj/item/melee/spear(H), ITEM_SLOT_BACK)
//ice cube
/obj/item/freeze_cube
@@ -1204,7 +1168,7 @@
var/loot = rand(1,4)
switch(loot)
if(1)
- new /obj/item/melee/ghost_sword(src)
+ new /obj/item/melee/sword/claymore(src)
if(2)
new /obj/item/lava_staff(src)
if(3)
@@ -1212,91 +1176,6 @@
if(4)
new /obj/item/dragons_blood(src)
-/obj/item/melee/ghost_sword
- name = "\improper spectral blade"
- desc = "A rusted and dulled blade. It doesn't look like it'd do much damage. It glows weakly."
- icon_state = "spectral"
- item_state = "spectral"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- flags_1 = CONDUCT_1
- sharpness = IS_SHARP
- w_class = WEIGHT_CLASS_BULKY
- force = 1
- throwforce = 1
- hitsound = 'sound/effects/ghost2.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended")
- var/summon_cooldown = 0
- var/list/mob/dead/observer/spirits
-
-/obj/item/melee/ghost_sword/Initialize()
- . = ..()
- spirits = list()
- START_PROCESSING(SSobj, src)
- GLOB.poi_list |= src
- AddComponent(/datum/component/butchering, 150, 90)
-
-/obj/item/melee/ghost_sword/Destroy()
- for(var/mob/dead/observer/G in spirits)
- G.invisibility = GLOB.observer_default_invisibility
- spirits.Cut()
- STOP_PROCESSING(SSobj, src)
- GLOB.poi_list -= src
- . = ..()
-
-/obj/item/melee/ghost_sword/attack_self(mob/user)
- if(summon_cooldown > world.time)
- to_chat(user, "You just recently called out for aid. You don't want to annoy the spirits!")
- return
- to_chat(user, "You call out for aid, attempting to summon spirits to your side.")
-
- notify_ghosts("[user] is raising [user.p_their()] [src], calling for your help!",
- enter_link="(Click to help)",
- source = user, action=NOTIFY_ORBIT, ignore_key = POLL_IGNORE_SPECTRAL_BLADE, header = "Spectral blade")
-
- summon_cooldown = world.time + 300
-
-/obj/item/melee/ghost_sword/process()
- ghost_check()
-
-/obj/item/melee/ghost_sword/proc/ghost_check()
- var/ghost_counter = 0
- var/turf/T = get_turf(src)
- var/list/contents = T.GetAllContents()
- var/mob/dead/observer/current_spirits = list()
- for(var/thing in contents)
- var/atom/A = thing
- A.transfer_observers_to(src)
-
- for(var/i in orbiters?.orbiters)
- if(!isobserver(i))
- continue
- var/mob/dead/observer/G = i
- ghost_counter++
- G.invisibility = 0
- current_spirits |= G
-
- for(var/mob/dead/observer/G in spirits - current_spirits)
- G.invisibility = GLOB.observer_default_invisibility
-
- spirits = current_spirits
-
- return ghost_counter
-
-/obj/item/melee/ghost_sword/attack(mob/living/target, mob/living/carbon/human/user)
- force = 0
- var/ghost_counter = ghost_check()
-
- force = clamp((ghost_counter * 4), 0, 75)
- user.visible_message("[user] strikes with the force of [ghost_counter] vengeful spirits!")
- ..()
-
-/obj/item/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- var/ghost_counter = ghost_check()
- final_block_chance += clamp((ghost_counter * 5), 0, 75)
- owner.visible_message("[owner] is protected by a ring of [ghost_counter] ghosts!")
- return ..()
-
//Blood
/obj/item/dragons_blood
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 15cde601689e..4b2774c3894a 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -121,6 +121,6 @@
new /obj/item/clothing/suit/hooded/explorer(src)
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/gun/energy/kinetic_accelerator(src)
- new /obj/item/kitchen/knife/combat/survival(src)
+ new /obj/item/melee/knife/survival(src)
new /obj/item/flashlight/seclite(src)
new /obj/item/clothing/gloves/explorer(src)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 8fbf9c32a38e..2dbbd9d4b65b 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -35,6 +35,7 @@
. = ..()
GLOB.new_player_list += src
+ SSpoints_of_interest.make_point_of_interest(src)
/mob/dead/new_player/Destroy()
GLOB.new_player_list -= src
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index c15c4a1af835..0fcfa5c13940 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -62,6 +62,9 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
var/datum/orbit_menu/orbit_menu
var/datum/spawners_menu/spawners_menu
+ // The POI we're orbiting (orbit menu)
+ var/orbiting_ref
+
/mob/dead/observer/Initialize()
set_invisibility(GLOB.observer_default_invisibility)
@@ -142,6 +145,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
. = ..()
+ SSpoints_of_interest.make_point_of_interest(src)
+
grant_all_languages()
show_data_huds()
data_huds_on = 1
@@ -499,7 +504,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/list/dest = list() //List of possible destinations (mobs)
var/target = null //Chosen target.
- dest += getpois(mobs_only = TRUE) //Fill list, prompt user with list
+ dest += SSpoints_of_interest.get_mob_pois()
target = input("Please, select a player!", "Jump to Mob", null, null) as null|anything in dest
if (!target)//Make sure we actually have a target
@@ -839,20 +844,24 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/reset_perspective(atom/A)
if(client)
if(ismob(client.eye) && (client.eye != src))
- var/mob/target = client.eye
- observetarget = null
- if(target.observers)
- LAZYREMOVE(target.observers, src)
+ cleanup_observe()
if(..())
if(hud_used)
client.screen = list()
hud_used.show_hud(hud_used.hud_version)
+/mob/dead/observer/proc/cleanup_observe()
+ var/mob/target = client.eye
+ observetarget = null
+ client?.perspective = initial(client.perspective)
+ if(target.observers)
+ LAZYREMOVE(target.observers, src)
+
/mob/dead/observer/verb/observe()
set name = "Observe"
set category = "Ghost"
- var/list/creatures = getpois()
+ var/list/creatures = SSpoints_of_interest.get_mob_pois()
reset_perspective(null)
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 86d54577538c..051faa5bedac 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -1,6 +1,9 @@
/datum/orbit_menu
+ ///mobs worth orbiting. Because spaghetti, all mobs have the point of interest, but only some are allowed to actually show up.
+ ///this obviously should be changed in the future, so we only add mobs as POI if they actually are interesting, and we don't use
+ ///a typecache.
+ var/static/list/mob_allowed_typecache
var/mob/dead/observer/owner
- var/auto_observe = FALSE
/datum/orbit_menu/New(mob/dead/observer/new_owner)
if(!istype(new_owner))
@@ -23,87 +26,243 @@
switch(action)
if ("orbit")
var/ref = params["ref"]
- var/atom/movable/poi = (locate(ref) in GLOB.mob_list) || (locate(ref) in GLOB.poi_list)
- if (poi == null)
- . = TRUE
- return
+ var/auto_observe = params["auto_observe"]
+ var/atom/movable/poi = SSpoints_of_interest.get_poi_atom_by_ref(ref)
+
+ if((ismob(poi) && !SSpoints_of_interest.is_valid_poi(poi, CALLBACK(src, PROC_REF(validate_mob_poi)))) \
+ || !SSpoints_of_interest.is_valid_poi(poi)
+ )
+ to_chat(usr, span_notice("That point of interest is no longer valid."))
+ return TRUE
+
+ var/mob/dead/observer/user = usr
owner.ManualFollow(poi)
owner.reset_perspective(null)
+ user.orbiting_ref = ref
if (auto_observe)
owner.do_observe(poi)
. = TRUE
if ("refresh")
update_static_data(owner, ui)
. = TRUE
- if ("toggle_observe")
- auto_observe = !auto_observe
- if (auto_observe && owner.orbit_target)
- owner.do_observe(owner.orbit_target)
- else
- owner.reset_perspective(null)
+
/datum/orbit_menu/ui_data(mob/user)
var/list/data = list()
- data["auto_observe"] = auto_observe
+
+ if(isobserver(user))
+ data["orbiting"] = get_currently_orbiting(user)
+
return data
/datum/orbit_menu/ui_static_data(mob/user)
- var/list/data = list()
+ var/list/new_mob_pois = SSpoints_of_interest.get_mob_pois(CALLBACK(src, PROC_REF(validate_mob_poi)), append_dead_role = FALSE)
+ var/list/new_other_pois = SSpoints_of_interest.get_other_pois()
var/list/alive = list()
var/list/antagonists = list()
+ var/list/critical = list()
var/list/dead = list()
var/list/ghosts = list()
var/list/misc = list()
var/list/npcs = list()
+ var/list/ships = list()
- var/list/pois = getpois(skip_mindless = TRUE, specify_dead_role = FALSE)
- for (var/name in pois)
+ for(var/name in new_mob_pois)
var/list/serialized = list()
- serialized["name"] = name
-
- var/poi = pois[name]
-
- serialized["ref"] = REF(poi)
-
- var/mob/M = poi
- if (istype(M))
- if (isobserver(M))
- ghosts += list(serialized)
- else if (M.stat == DEAD)
- dead += list(serialized)
- else if (M.mind == null)
- npcs += list(serialized)
- else
- var/number_of_orbiters = M.orbiters?.orbiters?.len
- if (number_of_orbiters)
- serialized["orbiters"] = number_of_orbiters
-
- var/datum/mind/mind = M.mind
- var/was_antagonist = FALSE
-
- for (var/_A in mind.antag_datums)
- var/datum/antagonist/A = _A
- if (A.show_to_ghosts)
- was_antagonist = TRUE
- serialized["antag"] = A.name
- antagonists += list(serialized)
- break
-
- if (!was_antagonist)
- alive += list(serialized)
+ var/mob/mob_poi = new_mob_pois[name]
+ var/number_of_orbiters = length(mob_poi.get_all_orbiters())
+
+ if(isnewplayer(mob_poi))
+ continue
+
+ serialized["ref"] = REF(mob_poi)
+ serialized["full_name"] = mob_poi.name
+ serialized["job"] = mob_poi.job
+ if(number_of_orbiters)
+ serialized["orbiters"] = number_of_orbiters
+
+ if(isobserver(mob_poi))
+ ghosts += list(serialized)
+ continue
+
+ if(mob_poi.stat == DEAD)
+ dead += list(serialized)
+ continue
+
+ if(isnull(mob_poi.mind))
+ if(isliving(mob_poi))
+ var/mob/living/npc = mob_poi
+ serialized["health"] = FLOOR((npc.health / npc.maxHealth * 100), 1)
+
+ npcs += list(serialized)
+ continue
+
+ serialized["client"] = !!mob_poi.client
+ serialized["name"] = mob_poi.real_name
+
+ if(isliving(mob_poi))
+ serialized += get_living_data(mob_poi)
+
+ var/list/antag_data = get_antag_data(mob_poi.mind)
+ if(length(antag_data))
+ serialized += antag_data
+ antagonists += list(serialized)
+ continue
+
+ alive += list(serialized)
+
+ for(var/name in new_other_pois)
+ var/atom/atom_poi = new_other_pois[name]
+
+ var/list/other_data = get_misc_data(atom_poi)
+ var/misc_data = list(other_data[1])
+
+ if(istype(atom_poi, /obj/machinery/computer/helm))
+ ships += misc_data
else
- misc += list(serialized)
-
- data["alive"] = alive
- data["antagonists"] = antagonists
- data["dead"] = dead
- data["ghosts"] = ghosts
- data["misc"] = misc
- data["npcs"] = npcs
- return data
+ misc += misc_data
+
+ if(other_data[2]) // Critical = TRUE
+ critical += misc_data
+
+ return list(
+ "alive" = alive,
+ "antagonists" = antagonists,
+ "critical" = critical,
+ "dead" = dead,
+ "ghosts" = ghosts,
+ "misc" = misc,
+ "npcs" = npcs,
+ "ships" = ships,
+ )
/datum/orbit_menu/ui_assets()
. = ..() || list()
. += get_asset_datum(/datum/asset/simple/orbit)
+/// Helper function to get threat type, group, overrides for job and icon
+/datum/orbit_menu/proc/get_antag_data(datum/mind/poi_mind) as /list
+ var/list/serialized = list()
+
+ for(var/datum/antagonist/antag as anything in poi_mind.antag_datums)
+ if(!antag.show_to_ghosts)
+ continue
+
+ serialized["antag"] = antag.name
+ serialized["antag_group"] = antag.antagpanel_category
+ serialized["job"] = antag.name
+ serialized["icon"] = antag.antag_hud_name
+
+ return serialized
+
+/// Helper to get the current thing we're orbiting (if any)
+/datum/orbit_menu/proc/get_currently_orbiting(mob/dead/observer/user)
+ if(isnull(user.orbiting_ref))
+ return
+
+ var/atom/poi = SSpoints_of_interest.get_poi_atom_by_ref(user.orbiting_ref)
+ if(isnull(poi))
+ user.orbiting_ref = null
+ return
+
+ if((ismob(poi) && !SSpoints_of_interest.is_valid_poi(poi, CALLBACK(src, PROC_REF(validate_mob_poi)))) \
+ || !SSpoints_of_interest.is_valid_poi(poi)
+ )
+ user.orbiting_ref = null
+ return
+
+ var/list/serialized = list()
+
+ if(!ismob(poi))
+ var/list/misc_info = get_misc_data(poi)
+ serialized += misc_info[1]
+ return serialized
+
+ var/mob/mob_poi = poi
+ serialized["full_name"] = mob_poi.name
+ serialized["ref"] = REF(poi)
+
+ if(mob_poi.mind)
+ serialized["client"] = !!mob_poi.client
+ serialized["name"] = mob_poi.real_name
+
+ if(isliving(mob_poi))
+ serialized += get_living_data(mob_poi)
+
+ return serialized
+
+/// Helper function to get job / icon / health data for a living mob
+/datum/orbit_menu/proc/get_living_data(mob/living/player) as /list
+ var/list/serialized = list()
+
+ serialized["health"] = FLOOR((player.health / player.maxHealth * 100), 1)
+
+ return serialized
+
+
+/// Gets a list: Misc data and whether it's critical. Handles all snowflakey type cases
+/datum/orbit_menu/proc/get_misc_data(atom/movable/atom_poi) as /list
+ var/list/misc = list()
+ var/critical = FALSE
+
+ misc["ref"] = REF(atom_poi)
+ misc["full_name"] = atom_poi.name
+
+ // Display the nuke timer
+ if(istype(atom_poi, /obj/machinery/nuclearbomb))
+ var/obj/machinery/nuclearbomb/bomb = atom_poi
+
+ if(bomb.timing)
+ misc["extra"] = "Timer: [bomb.countdown?.displayed_text]s"
+ critical = TRUE
+
+ return list(misc, critical)
+
+ // Display the holder if its a nuke disk
+ if(istype(atom_poi, /obj/item/disk/nuclear))
+ var/obj/item/disk/nuclear/disk = atom_poi
+ var/mob/holder = disk.pulledby || get(disk, /mob)
+ misc["extra"] = "Location: [holder?.real_name || "Unsecured"]"
+
+ return list(misc, critical)
+
+ // Display singuloths if they exist
+ if(istype(atom_poi, /obj/singularity))
+ var/obj/singularity/singulo = atom_poi
+ misc["extra"] = "Energy: [round(singulo.energy)]"
+
+ if(singulo.current_size > 2)
+ critical = TRUE
+
+ return list(misc, critical)
+
+ if(istype(atom_poi, /obj/machinery/computer/helm))
+ var/obj/machinery/computer/helm/helm_poi = atom_poi
+ if(helm_poi.current_ship)
+ misc["extra"] = "Ship: [helm_poi.current_ship.name]"
+
+ return list(misc, critical)
+
+ return list(misc, critical)
+
+/**
+ * Helper POI validation function passed as a callback to various SSpoints_of_interest procs.
+ *
+ * Provides extended validation above and beyond standard, limiting mob POIs without minds or ckeys
+ * unless they're mobs, camera mobs or megafauna. Also allows exceptions for mobs that are deadchat controlled.
+ *
+ * If they satisfy that requirement, falls back to default validation for the POI.
+ */
+/datum/orbit_menu/proc/validate_mob_poi(datum/point_of_interest/mob_poi/potential_poi)
+ var/mob/potential_mob_poi = potential_poi.target
+ if(!potential_mob_poi.mind && !potential_mob_poi.ckey)
+ if(!mob_allowed_typecache)
+ mob_allowed_typecache = typecacheof(list(
+ /mob/living/simple_animal/hostile/megafauna,
+ /mob/living/simple_animal/hostile/boss
+ ))
+ if(!is_type_in_typecache(potential_mob_poi, mob_allowed_typecache) && !potential_mob_poi.GetComponent(/datum/component/deadchat_control))
+ return FALSE
+
+ return potential_poi.validate()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 1258df8b84c5..6046cfe82b63 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -9,6 +9,7 @@
diag_hud.add_to_hud(src)
faction += "[REF(src)]"
GLOB.mob_living_list += src
+ SSpoints_of_interest.make_point_of_interest(src)
if(speed)
update_living_varspeed()
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 01610cd13644..665e75da9cef 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -170,7 +170,7 @@
to_chat(user, "Please close the access panel before locking it.")
else
to_chat(user, "\The [src] doesn't seem to respect your authority.")
- else if(istype(W, /obj/item/kitchen/knife) && user.a_intent != INTENT_HARM)
+ else if(istype(W, /obj/item/melee/knife) && user.a_intent != INTENT_HARM)
to_chat(user, "You start attaching \the [W] to \the [src]...")
if(do_after(user, 25, target = src))
deputize(W, user)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
index e0537594c8ff..76dc1f095009 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
@@ -30,11 +30,6 @@
var/area/A = get_area(src)
if(A)
notify_ghosts("A drone shell has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_DRONE)
- GLOB.poi_list |= src
-
-/obj/effect/mob_spawn/drone/Destroy()
- GLOB.poi_list -= src
- . = ..()
//ATTACK GHOST IGNORING PARENT RETURN VALUE
/obj/effect/mob_spawn/drone/attack_ghost(mob/user)
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index d43d744e2800..b6f5c58b424e 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -115,7 +115,7 @@
name = "pile of bear armor"
desc = "A scattered pile of various shaped armor pieces fitted for a bear, some duct tape, and a nail filer. Crude instructions \
are written on the back of one of the plates. This seems like an awful idea."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "bear_armor_upgrade"
/obj/item/bear_armor/afterattack(atom/target, mob/user, proximity_flag)
diff --git a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
index ba5f75ffb249..d8b4af5344ea 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
@@ -9,7 +9,7 @@
melee_damage_lower = 15
melee_damage_upper = 15
loot = list(/obj/effect/mob_spawn/human/corpse/frontier,
- /obj/item/kitchen/knife/combat/survival)
+ /obj/item/melee/knife/survival)
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)
faction = list(FACTION_ANTAG_FRONTIERSMEN)
footstep_type = FOOTSTEP_MOB_SHOE
diff --git a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
index b251dda91e48..147c2081f622 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
@@ -49,7 +49,7 @@
loot = list(/obj/effect/decal/remains/human,
/obj/item/clothing/suit/armor/witchhunter,
/obj/item/clothing/head/witchunter,
- /obj/item/claymore/weak{name = "holy sword"})
+ /obj/item/melee/sword/claymore{name = "holy sword"})
/mob/living/simple_animal/hostile/human/skeleton/ice
name = "ice skeleton"
diff --git a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
index 799c24550689..d8995c3cbbd1 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
@@ -131,7 +131,7 @@
/obj/item/stack/marker_beacon/ten = 15,
/obj/item/mining_scanner = 5,
/obj/item/extinguisher/mini = 10,
- /obj/item/kitchen/knife/combat = 5,
+ /obj/item/melee/knife/combat = 5,
/obj/item/flashlight/seclite = 10,
/obj/item/stack/sheet/sinew = 10,
/obj/item/stack/sheet/bone = 5,
@@ -147,7 +147,7 @@
/obj/item/stack/marker_beacon/ten = 10,
/obj/item/mining_scanner = 20,
/obj/item/extinguisher/mini = 10,
- /obj/item/kitchen/knife/combat/survival = 10,
+ /obj/item/melee/knife/survival = 10,
/obj/item/flashlight/seclite = 10,
/obj/item/stack/sheet/sinew = 10,
/obj/item/stack/sheet/bone = 10
@@ -159,11 +159,11 @@
/obj/item/stack/marker_beacon/ten = 5,
/obj/item/mining_scanner = 5,
/obj/item/extinguisher/mini = 10,
- /obj/item/kitchen/knife/combat/survival = 12,
+ /obj/item/melee/knife/survival = 12,
/obj/item/flashlight/seclite = 10,
/obj/item/stack/sheet/sinew = 5,
/obj/item/stack/sheet/bone = 5,
- /obj/item/kitchen/knife/combat = 3,
+ /obj/item/melee/knife/combat = 3,
/obj/item/reagent_containers/food/snacks/rationpack = 30
)
)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/codename_claw.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/codename_claw.dm
index a762a9298279..d3a50564ca75 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/codename_claw.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/codename_claw.dm
@@ -58,7 +58,7 @@
speed = 5
move_to_delay = 5
speak_emote = list("verbalizes")
- mob_trophy = /obj/item/nullrod/armblade/tentacle
+ mob_trophy = /obj/item/melee/synthetic_arm_blade
loot = list(/obj/effect/spawner/clawloot)
health = 2250
maxHealth = 2250
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 863abf56dad1..ff06df9c6113 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -607,12 +607,12 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box)
var/ready_to_deploy = FALSE
/obj/machinery/anomalous_crystal/helpers/Destroy()
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
. = ..()
/obj/machinery/anomalous_crystal/helpers/ActivationReaction(mob/user, method)
if(..() && !ready_to_deploy)
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
ready_to_deploy = TRUE
notify_ghosts("An anomalous crystal has been activated in [get_area(src)]! This crystal can always be used by ghosts hereafter.", enter_link = "(Click to enter)", ghost_sound = 'sound/effects/ghost2.ogg', source = src, action = NOTIFY_ATTACK, header = "Anomalous crystal activated")
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm
index 08ef1a7b21cb..c06c78068ce9 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm
@@ -23,8 +23,8 @@
ranged_cooldown_time = 20
vision_range = 10
damage_coeff = list(BRUTE = 1, BURN = 0.5, TOX = 0.5, CLONE = 0.5, STAMINA = 0, OXY = 0.5)
- loot = list(/obj/item/claymore/cursed, /obj/item/clothing/suit/space/hardsuit/cult/enchanted)
- mob_trophy = list(/obj/item/claymore/cursed, /obj/item/clothing/suit/space/hardsuit/cult/enchanted, /obj/item/upgradescroll)
+ loot = list(/obj/item/melee/sword/claymore, /obj/item/clothing/suit/space/hardsuit/cult/enchanted)
+ mob_trophy = list(/obj/item/melee/sword/claymore, /obj/item/clothing/suit/space/hardsuit/cult/enchanted, /obj/item/upgradescroll)
wander = FALSE
del_on_death = TRUE
blood_volume = BLOOD_VOLUME_NORMAL
@@ -40,7 +40,7 @@
/datum/action/innate/megafauna_attack/rapid_fire)
move_force = MOVE_FORCE_NORMAL
var/turf/starting
- var/obj/item/claymore/cursed/mob/weapon
+ var/obj/item/melee/sword/claymore/weapon
var/charging = FALSE
var/dash_cooldown = 6 SECONDS
var/runic_blast_cooldown = 14 SECONDS
@@ -50,23 +50,6 @@
var/dash_num = 3
var/newcolor = rgb(149, 10, 10)
-/obj/item/claymore/cursed
- name = "cursed longsword"
- desc = "For those who overcame a great challenge. It glows with a dim red light."
- icon_state = "cultblade"
- item_state = "cultblade"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- w_class = WEIGHT_CLASS_BULKY
- throwforce = 25
- block_chance = 65
- armour_penetration = 50
- sharpness = IS_SHARP
-
-/obj/item/claymore/cursed/mob
- block_chance = 0
- force = 16
-
/mob/living/simple_animal/hostile/megafauna/cult_templar/Initialize()
. = ..()
starting = get_turf(src)
@@ -421,7 +404,7 @@
/obj/item/clothing/suit/space/hardsuit/cult/enchanted
name = "\improper Cursed Nar'Sien hardened armor"
desc = "A heavily-armored exosuit worn by warriors of the Nar'Sien cult. This one is cursed, screaming voices into the mind of the wearer."
- allowed = list(/obj/item/gun, /obj/item/nullrod, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/tank/internals)
armor = list("melee" = 75, "bullet" = 50, "laser" = 30, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 80, "fire" = 100, "acid" = 100)
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | LAVA_PROOF
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 b7ca291a5be4..bd9133ffce20 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
@@ -297,6 +297,8 @@
/// track our timers and reagents
/obj/item/organ/legion_skull/proc/skull_check()
+ if(!owner)
+ return
if(!malignance)
malignance = new()
malignance.infect(owner, FALSE)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
index f0c70edc3037..1a347db1646b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
@@ -230,7 +230,7 @@
/obj/item/stack/marker_beacon/ten = 2,
/obj/item/mining_scanner = 2,
/obj/item/extinguisher/mini = 2,
- /obj/item/kitchen/knife/combat/survival = 3,
+ /obj/item/melee/knife/survival = 3,
/obj/item/flashlight/seclite = 3,
/obj/item/stack/sheet/sinew = 3,
/obj/item/stack/sheet/bone = 3
@@ -275,7 +275,7 @@
if(prob(75))
back = pick(/obj/item/storage/backpack/industrial, /obj/item/storage/backpack/satchel/eng, /obj/item/storage/backpack/duffelbag/engineering, /obj/item/storage/backpack/messenger/engi)
if(prob(10))
- back = /obj/item/fireaxe
+ back = /obj/item/melee/axe/fire
for(var/i = 1 to 3)
if(prob(75))
backpack_contents += pickweight(list(
@@ -424,7 +424,7 @@
if(prob(75))
accessory = /obj/item/clothing/accessory/armband/cargo
if(prob(25))
- suit = /obj/item/clothing/suit/armor/vest/scrap_armor
+ suit = /obj/item/clothing/suit/armor/vest/scrap
suit_store = /obj/item/gun/ballistic/rifle/illestren
/datum/outfit/generic/cargo
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index b1788a7aa50d..a05c2e65688e 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -462,7 +462,7 @@
else
client.perspective = EYE_PERSPECTIVE
client.eye = loc
- return 1
+ return TRUE
/// Show the mob's inventory to another mob
/mob/proc/show_inv(mob/user)
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
index 69da2287eb72..767a229d98f5 100644
--- a/code/modules/mod/modules/modules_ninja.dm
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -170,7 +170,7 @@
/// The item linked to the module that will get recalled.
var/obj/item/linked_weapon
/// The accepted typepath we can link to.
- var/accepted_type = /obj/item/energy_katana
+ var/accepted_type = /obj/item/melee/sword/energy_katana
/obj/item/mod/module/weapon_recall/on_suit_activation()
ADD_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
diff --git a/code/modules/modular_computers/file_system/programs/radar.dm b/code/modules/modular_computers/file_system/programs/radar.dm
index d082503a012d..06324b8f8b78 100644
--- a/code/modules/modular_computers/file_system/programs/radar.dm
+++ b/code/modules/modular_computers/file_system/programs/radar.dm
@@ -156,7 +156,7 @@
*something like "mob_209". In order to find the actual atom, we need
*to search the appropriate list for the REF string. This is dependant
*on the program (Lifeline uses GLOB.human_list, while Fission360 uses
- *GLOB.poi_list), but the result will be the same; evaluate the string and
+ *SSpoints_of_interest.other_points_of_interest), but the result will be the same; evaluate the string and
*return an atom reference.
*/
/datum/computer_file/program/radar/proc/find_atom()
@@ -269,7 +269,7 @@
pointercolor = "red"
/datum/computer_file/program/radar/fission360/find_atom()
- return locate(selected) in GLOB.poi_list
+ return locate(selected) in SSpoints_of_interest.other_points_of_interest
/datum/computer_file/program/radar/fission360/scan()
if(world.time < next_scan)
@@ -286,7 +286,7 @@
name = nuke.name,
)
objects += list(nukeinfo)
- var/obj/item/disk/nuclear/disk = locate() in GLOB.poi_list
+ var/obj/item/disk/nuclear/disk = locate() in SSpoints_of_interest.other_points_of_interest
if(trackable(disk))
var/list/nukeinfo = list(
ref = REF(disk),
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index c00d32d25809..14392e1c0874 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -1,37 +1,30 @@
-/obj/item/energy_katana
+/obj/item/melee/sword/energy_katana
name = "energy katana"
desc = "A katana infused with strong energy."
icon_state = "energy_katana"
item_state = "energy_katana"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
force = 40
throwforce = 20
block_chance = 50
armour_penetration = 50
- w_class = WEIGHT_CLASS_NORMAL
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
- sharpness = IS_SHARP
max_integrity = 200
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/datum/effect_system/spark_spread/spark_system
var/datum/action/innate/dash/ninja/jaunt
var/dash_toggled = TRUE
-/obj/item/energy_katana/Initialize()
+/obj/item/melee/sword/energy_katana/Initialize()
. = ..()
jaunt = new(src)
spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
-/obj/item/energy_katana/attack_self(mob/user)
+/obj/item/melee/sword/energy_katana/attack_self(mob/user)
dash_toggled = !dash_toggled
to_chat(user, "You [dash_toggled ? "enable" : "disable"] the dash function on [src].")
-/obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+/obj/item/melee/sword/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
if(dash_toggled)
jaunt.Teleport(user, target)
@@ -41,13 +34,13 @@
playsound(user, 'sound/weapons/blade1.ogg', 50, TRUE)
target.emag_act(user)
-/obj/item/energy_katana/pickup(mob/living/user)
+/obj/item/melee/sword/energy_katana/pickup(mob/living/user)
. = ..()
jaunt.Grant(user, src)
user.update_icons()
playsound(src, 'sound/items/unsheath.ogg', 25, TRUE)
-/obj/item/energy_katana/dropped(mob/user)
+/obj/item/melee/sword/energy_katana/dropped(mob/user)
. = ..()
jaunt?.Remove(user)
user.update_icons()
@@ -55,7 +48,7 @@
//If we hit the Ninja who owns this Katana, they catch it.
//Works for if the Ninja throws it or it throws itself or someone tries
//To throw it at the ninja
-/obj/item/energy_katana/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/melee/sword/energy_katana/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(ishuman(hit_atom))
var/mob/living/carbon/human/H = hit_atom
if(istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja))
@@ -66,7 +59,7 @@
..()
-/obj/item/energy_katana/proc/returnToOwner(mob/living/carbon/human/user, doSpark = 1, caught = 0)
+/obj/item/melee/sword/energy_katana/proc/returnToOwner(mob/living/carbon/human/user, doSpark = 1, caught = 0)
if(!istype(user))
return
forceMove(get_turf(user))
@@ -94,7 +87,7 @@
to_chat(user, "[msg]")
-/obj/item/energy_katana/Destroy()
+/obj/item/melee/sword/energy_katana/Destroy()
QDEL_NULL(spark_system)
QDEL_NULL(jaunt)
return ..()
diff --git a/code/modules/ninja/outfit.dm b/code/modules/ninja/outfit.dm
index 2b5976db4d59..1c3c24927bfd 100644
--- a/code/modules/ninja/outfit.dm
+++ b/code/modules/ninja/outfit.dm
@@ -12,7 +12,7 @@
l_pocket = /obj/item/grenade/c4/x4
r_pocket = /obj/item/tank/internals/emergency_oxygen
internals_slot = ITEM_SLOT_RPOCKET
- belt = /obj/item/energy_katana
+ belt = /obj/item/melee/sword/energy_katana
implants = list(/obj/item/implant/explosive)
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index cb355014d4e7..4f368b630496 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -26,7 +26,7 @@ Contents:
var/datum/effect_system/spark_spread/spark_system
var/datum/techweb/stored_research
var/obj/item/disk/tech_disk/t_disk//To copy design onto disk.
- var/obj/item/energy_katana/energyKatana //For teleporting the katana back to the ninja (It's an ability)
+ var/obj/item/melee/sword/energy_katana/energyKatana //For teleporting the katana back to the ninja (It's an ability)
//Other articles of ninja gear worn together, used to easily reference them after initializing.
var/obj/item/clothing/head/helmet/space/space_ninja/n_hood
diff --git a/code/modules/overmap/helm.dm b/code/modules/overmap/helm.dm
index 5b1f27fa2cb9..3b825ce39524 100644
--- a/code/modules/overmap/helm.dm
+++ b/code/modules/overmap/helm.dm
@@ -49,6 +49,8 @@
/obj/machinery/computer/helm/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
+ if(!viewer)
+ SSpoints_of_interest.make_point_of_interest(src)
jump_allowed = world.time + CONFIG_GET(number/bluespace_jump_wait)
ntnet_relay = new(src)
@@ -76,6 +78,7 @@
SStgui.close_uis(src)
ASSERT(length(concurrent_users) == 0)
QDEL_NULL(ntnet_relay)
+ SSpoints_of_interest.remove_point_of_interest(src)
if(current_ship)
current_ship.helms -= src
current_ship = null
diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm
index 5d851e52f4fd..efa4e36026c0 100644
--- a/code/modules/overmap/ships/controlled_ship_datum.dm
+++ b/code/modules/overmap/ships/controlled_ship_datum.dm
@@ -56,7 +56,7 @@
var/owner_check_timer_id
/// The ship's join mode. Controls whether players can join freely, have to apply, or can't join at all.
- var/join_mode = SHIP_JOIN_MODE_OPEN
+ var/join_mode = SHIP_JOIN_MODE_CLOSED
/// Lazylist of /datum/ship_applications for this ship. Only used if join_mode == SHIP_JOIN_MODE_APPLY
var/list/datum/ship_application/applications
diff --git a/code/modules/photography/_pictures.dm b/code/modules/photography/_pictures.dm
index 511d75ac6c3f..6570cd00bb04 100644
--- a/code/modules/photography/_pictures.dm
+++ b/code/modules/photography/_pictures.dm
@@ -45,7 +45,7 @@
if(!picture_image)
return
var/icon/small_img = icon(picture_image)
- var/icon/ic = icon('icons/obj/items_and_weapons.dmi', iconstate ? iconstate :"photo")
+ var/icon/ic = icon('icons/obj/items.dmi', iconstate ? iconstate :"photo")
small_img.Scale(8, 8)
ic.Blend(small_img,ICON_OVERLAY, 13, 13)
picture_icon = ic
diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm
index e91a03e421f3..c2096983fb03 100644
--- a/code/modules/photography/camera/camera.dm
+++ b/code/modules/photography/camera/camera.dm
@@ -4,7 +4,6 @@
/obj/item/camera
name = "camera"
- icon = 'icons/obj/items_and_weapons.dmi'
desc = "A polaroid camera."
icon_state = "camera"
item_state = "camera"
diff --git a/code/modules/photography/camera/film.dm b/code/modules/photography/camera/film.dm
index b44b93361083..a6001011eb29 100644
--- a/code/modules/photography/camera/film.dm
+++ b/code/modules/photography/camera/film.dm
@@ -3,7 +3,6 @@
*/
/obj/item/camera_film
name = "film cartridge"
- icon = 'icons/obj/items_and_weapons.dmi'
desc = "A camera film cartridge. Insert it into a camera to reload it."
icon_state = "film"
item_state = "electropack"
diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm
index 2ba5f5499307..19c2c1297f6b 100644
--- a/code/modules/photography/photos/album.dm
+++ b/code/modules/photography/photos/album.dm
@@ -4,7 +4,7 @@
/obj/item/storage/photo_album
name = "photo album"
desc = "A big book used to store photos and mementos."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "album"
item_state = "album"
lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm
index 7274d477babb..ea3b4ff6a99d 100644
--- a/code/modules/photography/photos/photo.dm
+++ b/code/modules/photography/photos/photo.dm
@@ -3,7 +3,7 @@
*/
/obj/item/photo
name = "photo"
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "photo"
item_state = "paper"
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 9218b829e940..499a88b161f1 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -38,7 +38,7 @@
src.energy = starting_energy
. = ..()
START_PROCESSING(SSobj, src)
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
GLOB.singularities |= src
for(var/obj/machinery/power/singularity_beacon/singubeacon in GLOB.machines)
if(singubeacon.active)
@@ -53,7 +53,7 @@
/obj/singularity/Destroy()
STOP_PROCESSING(SSobj, src)
- GLOB.poi_list.Remove(src)
+ SSpoints_of_interest.remove_point_of_interest(src)
GLOB.singularities.Remove(src)
return ..()
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index b6fc6367e85c..400366415d9a 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -275,7 +275,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
SSair.start_processing_machine(src, mapload)
countdown = new(src)
countdown.start()
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
radio = new(src)
radio.keyslot = new radio_key
radio.listening = 0
@@ -293,7 +293,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
investigate_log("has been destroyed.", INVESTIGATE_SUPERMATTER)
SSair.stop_processing_machine(src)
QDEL_NULL(radio)
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
QDEL_NULL(countdown)
if(is_main_engine && GLOB.main_supermatter_engine == src)
GLOB.main_supermatter_engine = null
@@ -804,7 +804,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
/obj/machinery/power/supermatter_crystal/attackby(obj/item/W, mob/living/user, params)
if(!istype(W) || (W.item_flags & ABSTRACT) || !istype(user))
return
- if(istype(W, /obj/item/melee/roastingstick))
+ if(istype(W, /obj/item/roastingstick))
return ..()
if(istype(W, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/cig = W
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 7d58610fc7f7..d4a6f71cca4d 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -151,7 +151,7 @@
/obj/singularity/energy_ball/orbit(obj/singularity/energy_ball/target)
if (istype(target))
target.orbiting_balls += src
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
target.dissipate_strength = target.orbiting_balls.len
. = ..()
diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm
index e235e00b98f6..8705a932b392 100644
--- a/code/modules/projectiles/ammunition/ballistic/revolver.dm
+++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm
@@ -88,14 +88,14 @@
projectile_type = /obj/projectile/bullet/c38/dumdum
/obj/item/ammo_casing/c38/hotshot
- name = ".38 hot shot bullet casing"
- desc = "A .38 hot shot bullet casing."
+ name = ".38 hearth bullet casing"
+ desc = "A .38 hearth bullet casing."
bullet_skin = "incen"
projectile_type = /obj/projectile/bullet/c38/hotshot
/obj/item/ammo_casing/c38/iceblox
- name = ".38 iceblox bullet casing"
- desc = "A .38 iceblox bullet casing."
+ name = ".38 chilled bullet casing"
+ desc = "A .38 chilled bullet casing."
bullet_skin = "surplus"
projectile_type = /obj/projectile/bullet/c38/iceblox
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index 9f6a8c169ecd..24854030c041 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -46,6 +46,13 @@
icon_state = "incendiary"
projectile_type = /obj/projectile/bullet/incendiary/shotgun
+/obj/item/ammo_casing/shotgun/blank
+ name = "blank shell"
+ desc = "A shell packed with powder but no projectile."
+ icon_state = "blank"
+ projectile_type = /obj/projectile/bullet/pellet/blank
+ custom_materials = list(/datum/material/iron=250)
+
/obj/item/ammo_casing/shotgun/improvised
name = "improvised shell"
desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index b590f0831df1..5b78f1fc93a1 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -113,13 +113,13 @@
ammo_type = /obj/item/ammo_casing/c38/dumdum
/obj/item/ammo_box/c38/hotshot
- name = "speed loader (.38 hot shot)"
- desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These hot shot bullets contain an incendiary payload that set targets alight."
+ name = "speed loader (.38 hearth)"
+ desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These hearthwine bullets contain an incendiary payload that set targets alight."
ammo_type = /obj/item/ammo_casing/c38/hotshot
/obj/item/ammo_box/c38/iceblox
- name = "speed loader (.38 iceblox)"
- desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These iceblox bullets contain a cryogenic payload that chills targets."
+ name = "speed loader (.38 chilled)"
+ desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These icewine bullets contain a cryogenic payload that chills targets."
ammo_type = /obj/item/ammo_casing/c38/iceblox
/obj/item/ammo_box/c38/empty
@@ -213,6 +213,18 @@
icon_state = "38box-surplus"
ammo_type = /obj/item/ammo_casing/c38/surplus
+/obj/item/ammo_box/c38_box/hotshot
+ name = "ammo box (.38 hearth)"
+ desc = "An unorthodox .38 Special cartridge infused with hearthwine. Catches the target on fire."
+ icon_state = "38hotshot"
+ ammo_type = /obj/item/ammo_casing/c38/hotshot
+
+/obj/item/ammo_box/c38_box/iceblox
+ name = "ammo box (.38 chilled)"
+ desc = "An unorthodox .38 Special cartridge infused with icewine. Chills the target, slowing them down."
+ icon_state = "38iceblox"
+ ammo_type = /obj/item/ammo_casing/c38/iceblox
+
/obj/item/ammo_box/a12g
name = "ammo box (12g buckshot)"
desc = "A box of 12-gauge buckshot shells, devastating at close range."
@@ -238,6 +250,12 @@
icon_state = "12gbox-rubbershot"
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
+/obj/item/ammo_box/a12g/blanks
+ name = "ammo box (12g blanks)"
+ desc = "A box of 12-gauge blank shells, designed for training."
+ icon_state ="12gbox-slug"
+ ammo_type = /obj/item/ammo_casing/shotgun/blank
+
/obj/item/ammo_box/c9mm
name = "ammo box (9mm)"
desc = "A box of standard 9mm ammo."
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index f97dc5a5ce86..28ef8cecdd80 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -207,6 +207,12 @@
///this is how much deviation the gun recoil can have, recoil pushes the screen towards the reverse angle you shot + some deviation which this is the max.
var/recoil_deviation = 22.5
+ ///Used if the guns recoil is lower then the min, it clamps the highest recoil
+ var/min_recoil = 0
+
+ var/gunslinger_recoil_bonus = 0
+ var/gunslinger_spread_bonus = 0
+
/// how many shots per burst, Ex: most machine pistols, M90, some ARs are 3rnd burst, while others like the GAR and laser minigun are 2 round burst.
var/burst_size = 3
///The rate of fire when firing in a burst. Not the delay between bursts
@@ -318,9 +324,6 @@
///This prevents gun from firing until the coodown is done, affected by lag
var/current_cooldown = 0
- var/gunslinger_recoil_bonus = 0
- var/gunslinger_spread_bonus = 0
-
/obj/item/gun/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
@@ -815,7 +818,7 @@
/obj/item/gun/proc/calculate_recoil(mob/user, recoil_bonus = 0)
if(HAS_TRAIT(user, TRAIT_GUNSLINGER))
recoil_bonus += gunslinger_recoil_bonus
- return clamp(recoil_bonus, 0 , INFINITY)
+ return clamp(recoil_bonus, min_recoil , INFINITY)
/obj/item/gun/proc/calculate_spread(mob/user, bonus_spread)
var/final_spread = 0
@@ -984,7 +987,6 @@
human_holder = src
for(var/obj/item/gun/at_risk in get_all_contents())
var/chance_to_fire = GUN_NO_SAFETY_MALFUNCTION_CHANCE_MEDIUM
- var/did_fire = FALSE
if(human_holder)
// gun is less likely to go off in a holster
if(at_risk == human_holder.s_store)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 0288813fd089..00f48cc29239 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -13,6 +13,8 @@
has_safety = TRUE
safety = TRUE
+ min_recoil = 0.1
+
valid_attachments = list(
/obj/item/attachment/silencer,
/obj/item/attachment/laser_sight,
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 2d3cb6908c83..2be77ee20835 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -127,6 +127,8 @@
sawn_off = TRUE
weapon_weight = WEAPON_MEDIUM
w_class = WEIGHT_CLASS_NORMAL
+ spread = 24
+ spread_unwielded = 30
slot_flags = ITEM_SLOT_BELT
/obj/item/gun/ballistic/rifle/solgov
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index eb8ea3355fe9..2d70bf9851bb 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -432,6 +432,14 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
sawn_off = TRUE
slot_flags = ITEM_SLOT_BELT
+ wield_slowdown = 0.25
+ wield_delay = 0.3 SECONDS //OP? maybe
+
+ spread = 8
+ spread_unwielded = 15
+ recoil = 3 //or not
+ recoil_unwielded = 5
+
/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact
name = "compact compact combat shotgun"
desc = "A compact version of the compact version of the semi automatic combat shotgun. For when you want a gun the same size as your brain."
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index c2e5b4cb2933..40fd10e94785 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -46,7 +46,7 @@
/obj/item/gun/energy/pulse/prize/Initialize()
. = ..()
- GLOB.poi_list += src
+ SSpoints_of_interest.make_point_of_interest(src)
var/turf/T = get_turf(src)
message_admins("A pulse rifle prize has been created at [ADMIN_VERBOSEJMP(T)]")
@@ -55,7 +55,7 @@
notify_ghosts("Someone won a pulse rifle as a prize!", source = src, action = NOTIFY_ORBIT, header = "Pulse rifle prize")
/obj/item/gun/energy/pulse/prize/Destroy()
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
. = ..()
/obj/item/gun/energy/pulse/pistol
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index dede2ce0d7ce..340aa692f5b2 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -69,7 +69,7 @@
imp.implant(M)
/obj/projectile/bullet/c38/hotshot //similar to incendiary bullets, but do not leave a flaming trail
- name = ".38 hot shot bullet"
+ name = ".38 hearth bullet"
ricochets_max = 0
/obj/projectile/bullet/c38/hotshot/on_hit(atom/target, blocked = FALSE)
@@ -80,7 +80,7 @@
M.IgniteMob()
/obj/projectile/bullet/c38/iceblox //see /obj/projectile/temp for the original code
- name = ".38 iceblox bullet"
+ name = ".38 chilled bullet"
var/temperature = 100
ricochets_max = 0
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index ba9c8c88d7f8..a069102a39cc 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -114,3 +114,9 @@
damage = 30
armour_penetration = -25
tile_dropoff = 3
+
+/obj/projectile/bullet/pellet/blank
+ name = "blank"
+ damage = 30
+ range = 2
+ armour_penetration = -70
diff --git a/code/modules/reagents/reagent_containers/concrete_bags.dm b/code/modules/reagents/reagent_containers/concrete_bags.dm
new file mode 100644
index 000000000000..eaceb1c85631
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/concrete_bags.dm
@@ -0,0 +1,58 @@
+/* In a better world, the logic for transfering reagents out of containers wouldn't be in /glass */
+
+/obj/item/reagent_containers/glass/concrete_bag
+ name = "\improper concrete mix bag"
+ desc = "A bag of concrete mixture from the F.O.O.D corportation. Just add water!"
+ w_class = WEIGHT_CLASS_HUGE //25+ kg
+ throw_range = 1
+
+ amount_per_transfer_from_this = 25
+ possible_transfer_amounts = list(25,50,75,100)
+ list_reagents = list(/datum/reagent/concrete_mix = 200)
+ reagent_flags = OPENCONTAINER
+ volume = 200
+
+ icon = 'icons/obj/chemical/concrete.dmi'
+ icon_state = "concrete_bag"
+ item_state = "concrete_bag"
+ lefthand_file = 'icons/mob/inhands/misc/concrete_bag_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/concrete_bag_righthand.dmi'
+ fill_icon_thresholds = null
+
+ var/opened = FALSE
+ var/opened_icon_state = "concrete_bag_open"
+
+ drop_sound = 'sound/items/handling/cloth_drop.ogg'
+ pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
+
+/obj/item/reagent_containers/glass/concrete_bag/examine(mob/user)
+ . = ..()
+ if(!opened)
+ . += span_notice("[src] is unopened")
+ else
+ . += span_notice("[src] has been opened")
+
+/obj/item/reagent_containers/glass/concrete_bag/AltClick(mob/user)
+ if(!can_interact(user))
+ return
+ if(!opened)
+ if(do_after(user, 3 SECONDS))
+ visible_message(span_notice("[user] tears the top of [src] off!"), span_notice("You tear the top off [src]!"))
+ playsound(src, 'sound/items/poster_ripped.ogg', 50, 1)
+ new /obj/effect/decal/cleanable/generic(get_turf(src))
+ icon_state = opened_icon_state
+ spillable = TRUE
+ opened = TRUE
+ return
+ return
+ return
+
+/obj/item/reagent_containers/glass/concrete_bag/attack_self(mob/user)
+ if(!opened)
+ return
+ ..()
+
+/obj/item/reagent_containers/glass/concrete_bag/attack(mob/user)
+ if(!opened)
+ return
+ ..()
diff --git a/code/modules/reagents/reagent_containers/jug.dm b/code/modules/reagents/reagent_containers/jug.dm
index 8214a0747dfc..de1570a9ef5c 100644
--- a/code/modules/reagents/reagent_containers/jug.dm
+++ b/code/modules/reagents/reagent_containers/jug.dm
@@ -147,8 +147,3 @@
/obj/item/reagent_containers/glass/chem_jug/hexacrete
name = "chemical jug (hexacrete)"
list_reagents = list(/datum/reagent/concrete/hexacrete = 150)
-
-/obj/item/reagent_containers/glass/chem_jug/concrete_mix
- name = "chemical jug (concrete mix)"
- desc = "Just pour out and add water!"
- list_reagents = list(/datum/reagent/concrete_mix = 150)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index b4f46e6e4c19..1fe7a307353d 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -180,7 +180,7 @@
/obj/item/reagent_containers/spray/pepper
name = "pepperspray"
desc = "Manufactured by UhangInc, used to blind and down an opponent quickly."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "pepperspray"
item_state = "pepperspray"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm
deleted file mode 100644
index bb56a69adf2b..000000000000
--- a/code/modules/research/bepis.dm
+++ /dev/null
@@ -1,275 +0,0 @@
-//This system is designed to act as an in-between for cargo and science, and the first major money sink in the game outside of just buying things from cargo (As of 10/9/19, anyway).
-
-//economics defined values, subject to change should anything be too high or low in practice.
-
-#define MACHINE_OPERATION 100000
-#define MACHINE_OVERLOAD 500000
-#define MAJOR_THRESHOLD 5500
-#define MINOR_THRESHOLD 3500
-#define STANDARD_DEVIATION 1000
-
-/obj/machinery/rnd/bepis
- name = "\improper B.E.P.I.S. Chamber"
- desc = "A high fidelity testing device which unlocks the secrets of the known universe using the two most powerful substances available to man: excessive amounts of electricity and capital."
- icon = 'icons/obj/machines/bepis.dmi'
- icon_state = "chamber"
- base_icon_state = "chamber"
- density = TRUE
- layer = ABOVE_MOB_LAYER
- use_power = IDLE_POWER_USE
- active_power_usage = ACTIVE_DRAW_HIGH
- circuit = /obj/item/circuitboard/machine/bepis
-
- var/banking_amount = 100
- var/banked_cash = 0 //stored player cash
- var/datum/bank_account/account //payer's account.
- var/account_name //name of the payer's account.
- var/error_cause = null
- //Vars related to probability and chance of success for testing
- var/major_threshold = MAJOR_THRESHOLD
- var/minor_threshold = MINOR_THRESHOLD
- var/std = STANDARD_DEVIATION //That's Standard Deviation, what did you think it was?
- //Stock part variables
- var/power_saver = 1
- var/inaccuracy_percentage = 1.5
- var/positive_cash_offset = 0
- var/negative_cash_offset = 0
- var/minor_rewards = list(
- //To add a new minor reward, add it here.
- /obj/item/stack/circuit_stack/full,
- /obj/item/pen/survival,
- /obj/item/toy/sprayoncan,
- )
- var/static/list/item_list = list()
-
-/obj/machinery/rnd/bepis/attackby(obj/item/O, mob/user, params)
- if(default_deconstruction_screwdriver(user, "chamber_open", "chamber", O))
- update_icon_state()
- return
- if(default_deconstruction_crowbar(O))
- return
- if(!is_operational)
- to_chat(user, "[src] can't accept money when it's not functioning.")
- return
- if(istype(O, /obj/item/holochip) || istype(O, /obj/item/spacecash/bundle))
- var/deposit_value = O.get_item_credit_value()
- banked_cash += deposit_value
- qdel(O)
- say("Deposited [deposit_value] credits into storage.")
- update_icon_state()
- return
- if(istype(O, /obj/item/card/bank))
- var/obj/item/card/bank/bank_card = O
- if(bank_card.registered_account)
- account = bank_card.registered_account
- account_name = bank_card.registered_name
- say("New account detected. Console Updated.")
- else
- say("No account detected on card. Aborting.")
- return
- return ..()
-
-/obj/machinery/rnd/bepis/RefreshParts()
- var/C = 0
- var/M = 0
- var/L = 0
- var/S = 0
- for(var/obj/item/stock_parts/capacitor/Cap in component_parts)
- C += ((Cap.rating - 1) * 0.1)
- power_saver = 1 - C
- for(var/obj/item/stock_parts/manipulator/Manip in component_parts)
- M += ((Manip.rating - 1) * 250)
- positive_cash_offset = M
- for(var/obj/item/stock_parts/micro_laser/Laser in component_parts)
- L += ((Laser.rating - 1) * 250)
- negative_cash_offset = L
- for(var/obj/item/stock_parts/scanning_module/Scan in component_parts)
- S += ((Scan.rating - 1) * 0.25)
- inaccuracy_percentage = (1.5 - S)
-
-/obj/machinery/rnd/bepis/proc/depositcash()
- var/deposit_value = 0
- deposit_value = banking_amount
- if(deposit_value == 0)
- update_icon_state()
- say("Attempting to deposit 0 credits. Aborting.")
- return
- deposit_value = clamp(round(deposit_value, 1), 1, 15000)
- if(!account)
- say("Cannot find user account. Please swipe a valid ID.")
- return
- if(!account.has_money(deposit_value))
- say("You do not possess enough credits.")
- return
- account.adjust_money(-deposit_value, "bepis") //The money vanishes, not paid to any accounts.
- SSblackbox.record_feedback("amount", "BEPIS_credits_spent", deposit_value)
- log_econ("[deposit_value] credits were inserted into [src] by [account.account_holder]")
- banked_cash += deposit_value
- use_power(1000 * power_saver)
- say("Cash deposit successful. There is [banked_cash] in the chamber.")
- update_icon_state()
- return
-
-/obj/machinery/rnd/bepis/proc/withdrawcash()
- var/withdraw_value = 0
- withdraw_value = banking_amount
- if(withdraw_value > banked_cash)
- say("Cannot withdraw more than stored funds. Aborting.")
- else
- banked_cash -= withdraw_value
- new /obj/item/spacecash/bundle(src.loc, withdraw_value)
- say("Withdrawing [withdraw_value] credits from the chamber.")
- update_icon_state()
- return
-
-/obj/machinery/rnd/bepis/proc/calcsuccess()
- var/turf/dropturf = null
- var/gauss_major = 0
- var/gauss_minor = 0
- var/gauss_real = 0
- var/list/turfs = block(locate(x-1,y-1,z),locate(x+1,y+1,z)) //NO MORE DISCS IN WINDOWS
- while(length(turfs))
- var/turf/T = pick_n_take(turfs)
- if(T.is_blocked_turf(TRUE))
- continue
- else
- dropturf = T
- break
- if (!dropturf)
- dropturf = drop_location()
- gauss_major = (gaussian(major_threshold, std) - negative_cash_offset) //This is the randomized profit value that this experiment has to surpass to unlock a tech.
- gauss_minor = (gaussian(minor_threshold, std) - negative_cash_offset) //And this is the threshold to instead get a minor prize.
- gauss_real = (gaussian(banked_cash, std*inaccuracy_percentage) + positive_cash_offset) //this is the randomized profit value that your experiment expects to give.
- say("Real: [gauss_real]. Minor: [gauss_minor]. Major: [gauss_major].")
- flick("chamber_flash",src)
- update_icon_state()
- banked_cash = 0
- if((gauss_real >= gauss_major) && (SSresearch.techweb_nodes_experimental.len > 0)) //Major Success.
- say("Experiment concluded with major success. New technology node discovered on technology disc.")
- new /obj/item/disk/tech_disk/major(dropturf,1)
- if(SSresearch.techweb_nodes_experimental.len == 0)
- say("Expended all available experimental technology nodes. Resorting to minor rewards.")
- return
- if(gauss_real >= gauss_minor) //Minor Success.
- var/reward = pick(minor_rewards)
- new reward(dropturf)
- say("Experiment concluded with partial success. Dispensing compiled research efforts.")
- return
- if(gauss_real <= -1) //Critical Failure
- say("ERROR: CRITICAL MACHIME MALFUNCTI- ON. CURRENCY IS NOT CRASH. CANNOT COMPUTE COMMAND: 'make bucks'") //not a typo, for once.
- new /mob/living/simple_animal/deer(dropturf, 1)
- use_power(MACHINE_OVERLOAD * power_saver) //To prevent gambling at low cost and also prevent spamming for infinite deer.
- return
- //Minor Failure
- error_cause = pick("attempted to sell grey products to American dominated market.","attempted to sell gray products to British dominated market.","placed wild assumption that PDAs would go out of style.","simulated product #76 damaged brand reputation mortally.","simulated business model resembled 'pyramid scheme' by 98.7%.","product accidently granted override access to all vessel doors.")
- say("Experiment concluded with zero product viability. Cause of error: [error_cause]")
- return
-
-/obj/machinery/rnd/bepis/update_icon_state()
- if(panel_open == TRUE)
- icon_state = "[base_icon_state]_open"
- return ..()
- if((use_power == ACTIVE_POWER_USE) && (banked_cash > 0) && (is_operational))
- icon_state = "[base_icon_state]_active_loaded"
- return ..()
- if (((use_power == IDLE_POWER_USE) && (banked_cash > 0)) || (banked_cash > 0) && (!is_operational))
- icon_state = "[base_icon_state]_loaded"
- return ..()
- if(use_power == ACTIVE_POWER_USE && is_operational)
- icon_state = "[base_icon_state]_active"
- return ..()
- if(((use_power == IDLE_POWER_USE) && (banked_cash == 0)) || (!is_operational))
- icon_state = base_icon_state
- return ..()
- return ..()
-
-/obj/machinery/rnd/bepis/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "Bepis", name)
- ui.open()
- RefreshParts()
-
-/obj/machinery/rnd/bepis/ui_data(mob/user)
- var/list/data = list()
- var/powered = FALSE
- var/zvalue = (banked_cash - (major_threshold - positive_cash_offset - negative_cash_offset))/(std)
- var/std_success = 0
- var/prob_success = 0
- //Admittedly this is messy, but not nearly as messy as the alternative, which is jury-rigging an entire Z-table into the code, or making an adaptive z-table.
- var/z = abs(zvalue)
- if(z > 0 && z <= 0.5)
- std_success = 19.1
- else if(z > 0.5 && z <= 1.0)
- std_success = 34.1
- else if(z > 1.0 && z <= 1.5)
- std_success = 43.3
- else if(z > 1.5 && z <= 2.0)
- std_success = 47.7
- else if(z > 2.0 && z <= 2.5)
- std_success = 49.4
- else
- std_success = 50
- if(zvalue > 0)
- prob_success = 50 + std_success
- else if(zvalue == 0)
- prob_success = 50
- else
- prob_success = 50 - std_success
-
- if(use_power == ACTIVE_POWER_USE)
- powered = TRUE
- data["account_owner"] = account_name
- data["amount"] = banking_amount
- data["stored_cash"] = banked_cash
- data["mean_value"] = (major_threshold - positive_cash_offset - negative_cash_offset)
- data["error_name"] = error_cause
- data["power_saver"] = power_saver
- data["accuracy_percentage"] = inaccuracy_percentage * 100
- data["positive_cash_offset"] = positive_cash_offset
- data["negative_cash_offset"] = negative_cash_offset
- data["manual_power"] = powered ? FALSE : TRUE
- data["silicon_check"] = issilicon(user)
- data["success_estimate"] = prob_success
- return data
-
-/obj/machinery/rnd/bepis/ui_act(action,params)
- . = ..()
- if(.)
- return
- switch(action)
- if("deposit_cash")
- if(use_power == IDLE_POWER_USE)
- return
- depositcash()
- if("withdraw_cash")
- if(use_power == IDLE_POWER_USE)
- return
- withdrawcash()
- if("begin_experiment")
- if(use_power == IDLE_POWER_USE)
- return
- if(banked_cash == 0)
- say("Please deposit funds to begin testing.")
- return
- calcsuccess()
- use_power(MACHINE_OPERATION * power_saver) //This thing should eat your APC battery if you're not careful.
- set_idle_power() //Machine shuts off after use to prevent spam and look better visually.
- update_icon_state()
- if("amount")
- var/input = text2num(params["amount"])
- if(input)
- banking_amount = input
- if("toggle_power")
- if(use_power == ACTIVE_POWER_USE)
- set_idle_power()
- else
- set_active_power()
- update_icon_state()
- if("account_reset")
- if(use_power == IDLE_POWER_USE)
- return
- account_name = ""
- account = null
- say("Account settings reset.")
- . = TRUE
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 79b28ccef331..340119a4e78a 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -97,18 +97,25 @@ other types of metals and chemistry for reagents).
color = "#8b70ff"
illustration = "design"
custom_materials = list(/datum/material/iron =300, /datum/material/glass =100)
+ var/disk_name = "Design Disk"
+ var/design_name
var/list/blueprints = list()
- var/list/starting_blueprints = list()
+ var/starting_blueprints = list()
var/max_blueprints = 1
/obj/item/disk/design_disk/Initialize()
. = ..()
pixel_x = base_pixel_x + rand(-5, 5)
pixel_y = base_pixel_y + rand(-5, 5)
- blueprints = new/list(max_blueprints)
+ if(design_name)
+ name = jointext(list(disk_name, design_name), " - ")
+ if(length(starting_blueprints))
+ for(var/design in starting_blueprints)
+ blueprints += new design()
/obj/item/disk/design_disk/adv
name = "Advanced Component Design Disk"
+ disk_name = "Advanced Design Disk"
color = "#bed876"
desc = "A disk for storing device design data for construction in lathes. This one has a little bit of extra storage space."
custom_materials = list(/datum/material/iron =300, /datum/material/glass = 100, /datum/material/silver = 50)
@@ -116,6 +123,7 @@ other types of metals and chemistry for reagents).
/obj/item/disk/design_disk/super
name = "Super Component Design Disk"
+ disk_name = "Super Design Disk"
color = "#c25454"
desc = "A disk for storing device design data for construction in lathes. This one has more extra storage space."
custom_materials = list(/datum/material/iron =300, /datum/material/glass = 100, /datum/material/silver = 50, /datum/material/gold = 50)
@@ -123,6 +131,7 @@ other types of metals and chemistry for reagents).
/obj/item/disk/design_disk/elite
name = "Elite Component Design Disk"
+ disk_name = "Elite Design Disk"
color = "#333333"
desc = "A disk for storing device design data for construction in lathes. This one has absurd amounts of extra storage space."
custom_materials = list(/datum/material/iron =300, /datum/material/glass = 100, /datum/material/silver = 100, /datum/material/gold = 100, /datum/material/bluespace = 50)
@@ -130,39 +139,60 @@ other types of metals and chemistry for reagents).
//Disks with content
/obj/item/disk/design_disk/ammo_c10mm
- name = "Design Disk - 10mm Ammo"
+ design_name = "10mm Ammo"
desc = "A design disk containing the pattern for a refill box of standard 10mm ammo, used in Stechkin pistols."
-
-/obj/item/disk/design_disk/ammo_c10mm/Initialize()
- . = ..()
- blueprints[1] = new /datum/design/c10mm()
-
+ starting_blueprints = (/datum/design/c10mm)
/obj/item/disk/design_disk/disposable_gun
- name = "design disk - disposable gun"
+ design_name = "Disposable gun"
desc = "A design disk containing designs for a cheap and disposable gun."
illustration = "gun"
max_blueprints = 2
-
-/obj/item/disk/design_disk/disposable_gun/Initialize()
- . = ..()
- blueprints[1] = new /datum/design/disposable_gun()
+ starting_blueprints = list(/datum/design/disposable_gun)
/obj/item/disk/design_disk/clip_mechs
- name = "design disk - CLIP exosuit modifications"
+ design_name = "CLIP exosuit modifications"
desc = "A design disk containing specifications for CLIP-custom exosuit conversions."
color = "#57b8f0"
max_blueprints = 2
-
-/obj/item/disk/design_disk/clip_mechs/Initialize()
- . = ..()
- blueprints[1] = new /datum/design/clip_ripley_upgrade()
- blueprints[2] = new /datum/design/clip_durand_upgrade()
+ starting_blueprints = list(/datum/design/clip_ripley_upgrade, /datum/design/clip_durand_upgrade)
/obj/item/disk/design_disk/ammo_c9mm
- name = "Design Disk - 9mm Ammo"
+ design_name = "9mm Ammo"
desc = "A design disk containing the pattern for a refill box of standard 9mm ammo, used in Commander pistols."
-
-/obj/item/disk/design_disk/ammo_c9mm/Initialize()
- . = ..()
- blueprints[1] = new /datum/design/c9mmautolathe()
+ starting_blueprints = list(/datum/design/c9mmautolathe)
+
+/obj/item/disk/design_disk/blanks
+ design_name = "Blank Ammo"
+ starting_blueprints = list(/datum/design/blank_shell)
+
+
+/obj/item/disk/design_disk/ammo_1911
+ design_name = "1911 Magazine"
+ desc = "A design disk containing the pattern for the classic 1911's seven round .45ACP magazine."
+ illustration = "ammo"
+ starting_blueprints = list(/datum/design/colt_1911_magazine)
+
+//KA modkit design discs
+/obj/item/disk/design_disk/modkit_disc
+ design_name = "KA Mod"
+ desc = "A design disc containing the design for a unique kinetic accelerator modkit. It's compatible with a research console."
+ illustration = "accel"
+ color = "#6F6F6F"
+ starting_blueprints = list(/datum/design/unique_modkit)
+
+/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe
+ design_name = "Offensive Mining Explosion Mod"
+ starting_blueprints = list(/datum/design/unique_modkit/offensive_turf_aoe)
+
+/obj/item/disk/design_disk/modkit_disc/rapid_repeater
+ design_name = "Rapid Repeater Mod"
+ starting_blueprints = list(/datum/design/unique_modkit/rapid_repeater)
+
+/obj/item/disk/design_disk/modkit_disc/resonator_blast
+ design_name = "Resonator Blast Mod"
+ starting_blueprints = list(/datum/design/unique_modkit/resonator_blast)
+
+/obj/item/disk/design_disk/modkit_disc/bounty
+ design_name = "Death Syphon Mod"
+ starting_blueprints = list(/datum/design/unique_modkit/bounty)
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index a2b295f2e6fa..0b679dfcc4bf 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -356,7 +356,7 @@
id = "kitchen_knife"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 12000)
- build_path = /obj/item/kitchen/knife
+ build_path = /obj/item/melee/knife/kitchen
category = list("initial","Dinnerware")
/datum/design/plastic_knife
@@ -364,7 +364,7 @@
id = "plastic_knife"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/plastic = 100)
- build_path = /obj/item/kitchen/knife/plastic
+ build_path = /obj/item/melee/knife/plastic
category = list("initial", "Tool Designs","Dinnerware")
/datum/design/fork
@@ -796,6 +796,14 @@
build_path = /obj/item/ammo_casing/shotgun/beanbag
category = list("initial", "Security", "Ammo")
+/datum/design/blank_shell
+ name = "Shotgun Blank"
+ id = "blank_shell"
+ build_type = AUTOLATHE | PROTOLATHE
+ materials = list(/datum/material/iron = 2000)
+ build_path = /obj/item/ammo_casing/shotgun/blank
+ category = list("Security", "Ammo")
+
/datum/design/riot_dart
name = "Foam Riot Dart"
id = "riot_dart"
@@ -865,7 +873,7 @@
id = "cleaver"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 18000)
- build_path = /obj/item/kitchen/knife/butcher
+ build_path = /obj/item/melee/knife/butcher
category = list("initial", "Dinnerware")
/datum/design/spraycan
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index fdfe0f7f7341..bbc83dd1e705 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -238,14 +238,6 @@
category = list("Research Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-/datum/design/board/bepis
- name = "Machine Design (B.E.P.I.S. Board)"
- desc = "The circuit board for a B.E.P.I.S."
- id = "bepis"
- build_path = /obj/item/circuitboard/machine/bepis
- category = list("Research Machinery")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO
-
/datum/design/board/rdserver
name = "Machine Design (R&D Server Board)"
desc = "The circuit board for an R&D Server."
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 816cd4f9fdbf..98a088756d81 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -229,7 +229,7 @@
id = "roastingstick"
build_type = PROTOLATHE
materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/bluespace = 250)
- build_path = /obj/item/melee/roastingstick
+ build_path = /obj/item/roastingstick
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 2a8f390e9e36..1c3edc8b7c32 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -18,7 +18,7 @@
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS
/datum/design/c38_hotshot
- name = "Speed Loader (.38 Hot Shot)"
+ name = "Speed Loader (.38 Hearth)"
desc = "Designed to quickly reload revolvers. Hot Shot bullets contain an incendiary payload."
id = "c38_hotshot"
build_type = PROTOLATHE
@@ -28,7 +28,7 @@
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS
/datum/design/c38_iceblox
- name = "Speed Loader (.38 Iceblox)"
+ name = "Speed Loader (.38 Chilled)"
desc = "Designed to quickly reload revolvers. Iceblox bullets contain a cryogenic payload."
id = "c38_iceblox"
build_type = PROTOLATHE
diff --git a/code/modules/research/research_disk.dm b/code/modules/research/research_disk.dm
index 5f4fce5fd457..0354fddd50de 100644
--- a/code/modules/research/research_disk.dm
+++ b/code/modules/research/research_disk.dm
@@ -23,17 +23,6 @@
. = ..()
stored_research = new /datum/techweb/admin
-/obj/item/disk/tech_disk/major
- name = "Reformatted technology disk"
- desc = "A disk containing a new, completed tech from the B.E.P.I.S. Upload the disk to an R&D Console to redeem the tech."
- color = "#FFBAFF"
- illustration = "bepis"
- custom_materials = list(/datum/material/iron=300, /datum/material/glass=100)
-
-/obj/item/disk/tech_disk/major/Initialize()
- . = ..()
- stored_research = new /datum/techweb/bepis
-
/obj/item/research_notes
name = "research notes"
desc = "Valuable scientific data. Use it in a research console to scan it."
diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm
index 339edcfaa9a3..4aae75fbeab2 100644
--- a/code/modules/research/techweb/_techweb.dm
+++ b/code/modules/research/techweb/_techweb.dm
@@ -53,19 +53,6 @@
organization = ship_name
return ..()
-/datum/techweb/bepis //Should contain only 1 BEPIS tech selected at random.
- id = "EXPERIMENTAL"
- organization = "Nanotrasen R&D"
-
-/datum/techweb/bepis/New()
- . = ..()
- var/bepis_id = pick(SSresearch.techweb_nodes_experimental) //To add a new tech to the BEPIS, add the ID to this pick list.
- var/datum/techweb_node/BN = (SSresearch.techweb_node_by_id(bepis_id))
- hidden_nodes -= BN.id //Has to be removed from hidden nodes
- research_node(BN, TRUE, FALSE)
- update_node_status(BN)
- SSresearch.techweb_nodes_experimental -= bepis_id
-
/datum/techweb/Destroy()
researched_nodes = null
researched_designs = null
diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm
index 73d732e28a1f..ff2b93791a77 100644
--- a/code/modules/research/techweb/_techweb_node.dm
+++ b/code/modules/research/techweb/_techweb_node.dm
@@ -7,7 +7,6 @@
var/display_name = "Errored Node"
var/description = "Why are you seeing this?"
var/hidden = FALSE //Whether it starts off hidden.
- var/experimental = FALSE //If the tech can be randomly granted by the BEPIS as a reward. Meant to be fully given in tech disks, not researched.
var/starting_node = FALSE //Whether it's available without any research.
var/list/prereq_ids = list()
var/list/design_ids = list()
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 5ad8c1915c97..12dee3405a8c 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -13,7 +13,7 @@
// Cargo Stuff
"c-reader", "desttagger", "salestagger", "handlabel", "packagewrap",
// Research Stuff
- "destructive_analyzer", "experimentor", "rdconsole", "bepis", "rdserver", "design_disk", "tech_disk", "mechfab",
+ "destructive_analyzer", "experimentor", "rdconsole", "rdserver", "design_disk", "tech_disk", "mechfab",
// Miscellaneous Stufff
"paystand", "space_heater", "bucket", "plastic_knife", "plastic_fork", "plastic_spoon", "fax",
// Security Stuff
@@ -1159,110 +1159,6 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
export_price = 5000
-////////////////////////B.E.P.I.S. Locked Techs////////////////////////
-/datum/techweb_node/light_apps
- id = "light_apps"
- display_name = "Illumination Applications"
- description = "Applications of lighting and vision technology not originally thought to be commercially viable."
- prereq_ids = list("base")
- design_ids = list("bright_helmet", "rld_mini")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/rolling_table
- id = "rolling_table"
- display_name = "Advanced Wheel Applications"
- description = "Adding wheels to things can lead to extremely beneficial outcomes."
- prereq_ids = list("base")
- design_ids = list("rolling_table")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/Mauna_Mug
- id = "mauna_mug"
- display_name = "Mauna Mug"
- description = "A bored scientist was thinking to himself for very long...and then realized his coffee got cold! He made this invention to solve this extreme problem."
- prereq_ids = list("base")
- design_ids = list("mauna_mug")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/spec_eng
- id = "spec_eng"
- display_name = "Specialized Engineering"
- description = "Conventional wisdom has deemed these engineering products 'technically' safe, but far too dangerous to traditionally condone."
- prereq_ids = list("base")
- design_ids = list("lava_rods", "eng_gloves")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/aus_security
- id = "aus_security"
- display_name = "Australicus Security Protocols"
- description = "It is said that security in the Australicus sector is tight, so we took some pointers from their equipment. Thankfully, our sector lacks any signs of these, 'dropbears'."
- prereq_ids = list("base")
- design_ids = list("stun_boomerang")
-
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/interrogation
- id = "interrogation"
- display_name = "Enhanced Interrogation Technology"
- description = "By cross-referencing several declassified documents from past dictatorial regimes, we were able to develop an incredibly effective interrogation device. \
- Ethical concerns about loss of free will do not apply to criminals, according to galactic law."
- prereq_ids = list("base")
- design_ids = list("hypnochair")
-
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3500)
- export_price = 3500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/sticky_advanced
- id = "sticky_advanced"
- display_name = "Advanced Tapenology"
- description = "The absolute pinnacle of engineering!"
- design_ids = list("electric_tape", "super_tape")
-
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/tackle_advanced
- id = "tackle_advanced"
- display_name = "Advanced Grapple Technology"
- description = "Nanotrasen would like to remind its researching staff that it is never acceptable to \"glomp\" your coworkers, and further \"scientific trials\" on the subject \
- will no longer be accepted in its academic journals."
- design_ids = list("tackle_dolphin", "tackle_rocket")
-
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/fishing
- id = "fishing"
- display_name = "Fishing Technology"
- description = "Cutting edge fishing advancements."
- prereq_ids = list("base")
- design_ids = list("fishing_rod_tech")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
//Helpers for debugging/balancing the techweb in its entirety!
/proc/total_techweb_exports()
var/list/datum/techweb_node/processing = list()
diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
index ac663059d0c0..3f80f17e8a32 100644
--- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
@@ -16,35 +16,6 @@ Slimecrossing Weapons
if(prob(20))
user.emote("scream")
-//Rainbow knife - Burning Rainbow
-/obj/item/kitchen/knife/rainbowknife
- name = "rainbow knife"
- desc = "A strange, transparent knife which constantly shifts color. It hums slightly when moved."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "rainbowknife"
- item_state = "rainbowknife"
- force = 18
- throwforce = 15
- damtype = BRUTE
-
-/obj/item/kitchen/knife/rainbowknife/afterattack(atom/O, mob/user, proximity)
- if(proximity && istype(O, /mob/living))
- damtype = pick(BRUTE, BURN, TOX, OXY)
- switch(damtype)
- if(BRUTE)
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("slashed","sliced","cut")
- if(BURN)
- hitsound = 'sound/weapons/sear.ogg'
- attack_verb = list("burned","singed","heated")
- if(TOX)
- hitsound = 'sound/weapons/pierce.ogg'
- attack_verb = list("poisoned","dosed","toxified")
- if(OXY)
- hitsound = 'sound/effects/space_wind.ogg'
- attack_verb = list("suffocated","winded","vacuumed")
- return ..()
-
//Adamantine shield - Chilling Adamantine
/obj/item/shield/adamantineshield
name = "adamantine shield"
diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm
index e9fd98232e2c..26c151e42316 100644
--- a/code/modules/research/xenobiology/crossbreeding/burning.dm
+++ b/code/modules/research/xenobiology/crossbreeding/burning.dm
@@ -305,11 +305,3 @@ Burning extracts:
new /obj/item/shield/adamantineshield(get_turf(user))
..()
-/obj/item/slimecross/burning/rainbow
- colour = "rainbow"
- effect_desc = "Creates the Rainbow Knife, a kitchen knife that deals random types of damage."
-
-/obj/item/slimecross/burning/rainbow/do_effect(mob/user)
- user.visible_message("[src] flattens into a glowing rainbow blade.")
- new /obj/item/kitchen/knife/rainbowknife(get_turf(user))
- ..()
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index 7b5bd27a8ada..0747fb746ddd 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -102,34 +102,3 @@
var/turf/open/chasm/C = T
C.set_target(dest)
C.drop(user)
-
-//can't be bothered to do sloth right now, will make later
-
-/obj/item/kitchen/knife/envy //Envy's knife: Found in the Envy ruin. Attackers take on the appearance of whoever they strike.
- name = "envy's knife"
- desc = "Their success will be yours."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "render"
- item_state = "knife"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
- force = 18
- throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
- hitsound = 'sound/weapons/bladeslice.ogg'
-
-/obj/item/kitchen/knife/envy/afterattack(atom/movable/AM, mob/living/carbon/human/user, proximity)
- . = ..()
- if(!proximity)
- return
- if(!istype(user))
- return
- if(ishuman(AM))
- var/mob/living/carbon/human/H = AM
- if(user.real_name != H.dna.real_name)
- user.real_name = H.dna.real_name
- H.dna.transfer_identity(user, transfer_SE=1)
- user.updateappearance(mutcolor_update=1)
- user.domutcheck()
- user.visible_message("[user]'s appearance shifts into [H]'s!", \
- "[H.p_they(TRUE)] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't.")
diff --git a/code/modules/ruins/rockplanet_ruin_code.dm b/code/modules/ruins/rockplanet_ruin_code.dm
index d09bbe9d5dd7..5eea45c24c6c 100644
--- a/code/modules/ruins/rockplanet_ruin_code.dm
+++ b/code/modules/ruins/rockplanet_ruin_code.dm
@@ -100,7 +100,7 @@
/obj/item/strange_crystal/attackby(obj/item/item, mob/user, params)
. = ..()
- if(!istype(item, /obj/item/kitchen/knife))
+ if(!istype(item, /obj/item/melee/knife))
return
playsound(src, 'sound/effects/glassbr1.ogg', 50, TRUE, -1)
to_chat(user, "You start breaking [src] up into shards...")
diff --git a/code/modules/ruins/spaceruin_code/bigderelict1.dm b/code/modules/ruins/spaceruin_code/bigderelict1.dm
index 99af3b9efa28..9e2a0957547b 100644
--- a/code/modules/ruins/spaceruin_code/bigderelict1.dm
+++ b/code/modules/ruins/spaceruin_code/bigderelict1.dm
@@ -6,13 +6,3 @@
/obj/item/paper/crumpled/ruins/bigderelict1/coward
icon_state = "scrap_bloodied"
default_raw_text = "If anyone finds this, please, don't let my kids know I died a coward.."
-
-/obj/item/disk/design_disk/ammo_1911
- name = "design disk - 1911 magazine"
- desc = "A design disk containing the pattern for the classic 1911's seven round .45ACP magazine."
- illustration = "ammo"
-
-/obj/item/disk/design_disk/ammo_1911/Initialize()
- . = ..()
- var/datum/design/colt_1911_magazine/M = new
- blueprints[1] = M
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 0c535f58ae23..756d889f5bc5 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -91,7 +91,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/storage/overmap_ship, 28)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/pickaxe/emergency(src)
- new /obj/item/kitchen/knife/hunting(src)
+ new /obj/item/melee/knife/hunting(src)
new /obj/item/survivalcapsule(src)
/obj/item/storage/overmap_ship/fueled/PopulateContents()
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 14a7497728a9..5af554a60557 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -321,6 +321,9 @@
///A list of all gravity generators currently linked to the shuttle.
var/list/gravgen_list = list()
+ ///A list of all turrets currently linked to the shuttle.
+ var/list/turret_list = list()
+
///if this shuttle can move docking ports other than the one it is docked at
var/can_move_docking_ports = TRUE
@@ -428,6 +431,7 @@
for(var/each in place)
var/atom/atom = each
atom.connect_to_shuttle(src, dock)
+ SEND_SIGNAL(src, COMSIG_SHIP_DONE_CONNECTING, dock)
//this is a hook for custom behaviour. Maybe at some point we could add checks to see if engines are intact
/obj/docking_port/mobile/proc/can_move()
diff --git a/code/modules/spells/spell_types/conjure.dm b/code/modules/spells/spell_types/conjure.dm
index c34d5cf7c985..d2e3cc957ad9 100644
--- a/code/modules/spells/spell_types/conjure.dm
+++ b/code/modules/spells/spell_types/conjure.dm
@@ -63,7 +63,7 @@
range = -1
clothes_req = FALSE
var/obj/item/item
- var/item_type = /obj/item/banhammer
+ var/item_type = /obj/item
school = "conjuration"
charge_max = 150
cooldown_min = 10
diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm
index 421b7f40f11c..f1654551df3a 100644
--- a/code/modules/spells/spell_types/devil.dm
+++ b/code/modules/spells/spell_types/devil.dm
@@ -1,25 +1,3 @@
-/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork
- name = "Summon Pitchfork"
- desc = "A devil's weapon of choice. Use this to summon/unsummon your pitchfork."
- invocation_type = "none"
- include_user = TRUE
- range = -1
- clothes_req = FALSE
- item_type = /obj/item/pitchfork/demonic
-
- school = "conjuration"
- charge_max = 150
- cooldown_min = 10
- action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
- action_icon_state = "pitchfork"
- action_background_icon_state = "bg_demon"
-
-/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/greater
- item_type = /obj/item/pitchfork/demonic/greater
-
-/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/ascended
- item_type = /obj/item/pitchfork/demonic/ascended
-
/obj/effect/proc_holder/spell/targeted/conjure_item/violin
item_type = /obj/item/instrument/violin/golden
desc = "A devil's instrument of choice. Use this to summon/unsummon your golden violin."
diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index 5cf7e7e1e509..94f0c8a4fcad 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -4,7 +4,7 @@
var/catchphrase = "High Five!"
var/on_use_sound = null
var/obj/effect/proc_holder/spell/targeted/touch/attached_spell
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
icon_state = "latexballon"
diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm
index 720670e3fc21..38e2f0df145e 100644
--- a/code/modules/spells/spell_types/lichdom.dm
+++ b/code/modules/spells/spell_types/lichdom.dm
@@ -99,7 +99,7 @@
name = "phylactery of [mind.name]"
active_phylacteries++
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
START_PROCESSING(SSobj, src)
if(initial(SSticker.mode.round_ends_with_antag_death))
SSticker.mode.round_ends_with_antag_death = FALSE
@@ -107,7 +107,7 @@
/obj/item/phylactery/Destroy(force=FALSE)
STOP_PROCESSING(SSobj, src)
active_phylacteries--
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
if(!active_phylacteries)
SSticker.mode.round_ends_with_antag_death = initial(SSticker.mode.round_ends_with_antag_death)
. = ..()
diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm
index d1c882f96620..0807e1e5c8cc 100644
--- a/code/modules/surgery/advanced/lobotomy.dm
+++ b/code/modules/surgery/advanced/lobotomy.dm
@@ -26,7 +26,7 @@
implements = list(
TOOL_SCALPEL = 85, // there is no way this should be reasonable to do basically at all without a real surgery. ghetto lobotomy, for real?
/obj/item/melee/transforming/energy/sword = 25,
- /obj/item/kitchen/knife = 15,
+ /obj/item/melee/knife = 15,
/obj/item/shard = 10,
/obj/item = 5)
time = 10 SECONDS
diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm
index 91cd1dce07e4..e737acbb78d7 100644
--- a/code/modules/surgery/amputation.dm
+++ b/code/modules/surgery/amputation.dm
@@ -14,9 +14,9 @@
TOOL_SCALPEL = 100,
TOOL_SAW = 100,
/obj/item/melee/arm_blade = 80,
- /obj/item/fireaxe = 50,
+ /obj/item/melee/axe/fire = 50,
/obj/item/hatchet = 40,
- /obj/item/kitchen/knife/butcher = 25)
+ /obj/item/melee/knife/butcher = 25)
time = 6.4 SECONDS
preop_sound = 'sound/surgery/scalpel1.ogg'
success_sound = 'sound/surgery/organ2.ogg'
diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm
index a4628d19efff..ceb376f3587c 100644
--- a/code/modules/surgery/coronary_bypass.dm
+++ b/code/modules/surgery/coronary_bypass.dm
@@ -22,7 +22,7 @@
name = "incise heart"
implements = list(
TOOL_SCALPEL = 90,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/knife = 40,
/obj/item/shard = 33)
time = 1.6 SECONDS
preop_sound = 'sound/surgery/scalpel1.ogg'
diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm
index 70dbac246e4e..eccf729d263f 100644
--- a/code/modules/surgery/experimental_dissection.dm
+++ b/code/modules/surgery/experimental_dissection.dm
@@ -34,7 +34,7 @@
/obj/item/scalpel/augment = 75,
/obj/item/scalpel/advanced = 60,
TOOL_SCALPEL = 45,
- /obj/item/kitchen/knife = 30,
+ /obj/item/melee/knife = 30,
/obj/item/shard = 10)// special tools not only cut down time but also improve probability
time = 125
silicons_obey_prob = TRUE
diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm
index f4bd48c4729d..6d00f5ae7588 100644
--- a/code/modules/surgery/gastrectomy.dm
+++ b/code/modules/surgery/gastrectomy.dm
@@ -25,7 +25,7 @@
implements = list(
TOOL_SCALPEL = 95,
/obj/item/melee/transforming/energy/sword = 33,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/knife = 40,
/obj/item/shard = 10)
time = 52
experience_given = (MEDICAL_SKILL_ORGAN_FIX*0.8) //for consistency across organ surgeries
diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm
index e612b6fa18c5..0571cf9b2397 100644
--- a/code/modules/surgery/hepatectomy.dm
+++ b/code/modules/surgery/hepatectomy.dm
@@ -24,7 +24,7 @@
implements = list(
TOOL_SCALPEL = 95,
/obj/item/melee/transforming/energy/sword = 33,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/knife = 40,
/obj/item/shard = 25)
time = 52
experience_given = (MEDICAL_SKILL_ORGAN_FIX*0.8) //repeatable so not as much xp
diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm
index 09ef68f03e18..79d3d79bcee5 100644
--- a/code/modules/surgery/lobectomy.dm
+++ b/code/modules/surgery/lobectomy.dm
@@ -23,7 +23,7 @@
implements = list(
TOOL_SCALPEL = 95,
/obj/item/melee/transforming/energy/sword = 33,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/knife = 40,
/obj/item/shard = 25)
time = 4.2 SECONDS
preop_sound = 'sound/surgery/scalpel1.ogg'
diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm
index 3730f7cf1302..694081f7af78 100644
--- a/code/modules/surgery/mechanic_steps.dm
+++ b/code/modules/surgery/mechanic_steps.dm
@@ -4,7 +4,7 @@
implements = list(
TOOL_SCREWDRIVER = 100,
TOOL_SCALPEL = 75, // med borgs could try to unscrew shell with scalpel
- /obj/item/kitchen/knife = 50,
+ /obj/item/melee/knife/kitchen = 50,
/obj/item = 10)
time = 2.4 SECONDS
preop_sound = 'sound/items/screwdriver.ogg'
@@ -28,7 +28,7 @@
implements = list(
TOOL_SCREWDRIVER = 100,
TOOL_SCALPEL = 75,
- /obj/item/kitchen/knife = 50,
+ /obj/item/melee/knife/kitchen = 50,
/obj/item = 10)
time = 2.4 SECONDS
preop_sound = 'sound/items/screwdriver.ogg'
diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm
index 42018e6c1d87..8959a7f99715 100644
--- a/code/modules/surgery/organic_steps.dm
+++ b/code/modules/surgery/organic_steps.dm
@@ -5,7 +5,7 @@
implements = list(
TOOL_SCALPEL = 100,
/obj/item/melee/transforming/energy/sword = 40,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/knife = 40,
/obj/item/shard = 25,
/obj/item = 15) //any sharp item
time = 1.6 SECONDS
@@ -151,18 +151,18 @@
name = "saw bone"
implements = list(
TOOL_SAW = 100,
- /obj/item/fireaxe = 50,
+ /obj/item/melee/axe/fire = 50,
/obj/item/melee/arm_blade = 40,
/obj/item/hatchet = 40,
- /obj/item/kitchen/knife/butcher = 33,
+ /obj/item/melee/knife/butcher = 33,
/obj/item = 10) //10% success (sort of) with any sharp item with a force>=10
time = 5.4 SECONDS
preop_sound = list(
/obj/item/circular_saw = 'sound/surgery/saw.ogg',
/obj/item/melee/arm_blade = 'sound/surgery/scalpel1.ogg',
- /obj/item/fireaxe = 'sound/surgery/scalpel1.ogg',
+ /obj/item/melee/axe/fire = 'sound/surgery/scalpel1.ogg',
/obj/item/hatchet = 'sound/surgery/scalpel1.ogg',
- /obj/item/kitchen/knife/butcher = 'sound/surgery/scalpel1.ogg',
+ /obj/item/melee/knife/butcher = 'sound/surgery/scalpel1.ogg',
/obj/item = 'sound/surgery/scalpel1.ogg',
)
success_sound = 'sound/surgery/bone3.ogg'
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 5d6fac852d51..665086d1981d 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -232,11 +232,11 @@
/obj/item/organ/cyberimp/arm/toolset/emag_act(mob/user)
for(var/datum/weakref/created_item in items_list)
var/obj/potential_knife = created_item.resolve()
- if(istype(/obj/item/kitchen/knife/combat/cyborg, potential_knife))
+ if(istype(/obj/item/melee/knife/combat/cyborg, potential_knife))
return FALSE
to_chat(user, "You unlock [src]'s integrated knife!")
- items_list += WEAKREF(new /obj/item/kitchen/knife/combat/cyborg(src))
+ items_list += WEAKREF(new /obj/item/melee/knife/combat/cyborg(src))
return TRUE
/obj/item/organ/cyberimp/arm/esword
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
index 9c87a5b5a93f..ed54575bb1bf 100644
--- a/code/modules/surgery/plastic_surgery.dm
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -8,7 +8,7 @@
name = "reshape face"
implements = list(
TOOL_SCALPEL = 100,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/knife = 40,
TOOL_WIRECUTTER = 33)
time = 64
experience_given = MEDICAL_SKILL_MEDIUM
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 317297c4fe8d..5da5f497bda4 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -171,7 +171,7 @@
//spases 4 legibilititie
icon_state = "swa"
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index d26226e3ea83..ef4630109543 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1892,7 +1892,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/role_restricted/greykingsword
name = "Blade of The Grey Tide"
desc = "A weapon of legend, forged by the greatest crackheads of our generation."
- item = /obj/item/melee/greykingsword
+ item = /obj/item/melee/sword/greyking
cost = 2
restricted_roles = list("Assistant", "Chemist")
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 8d6acea28452..ebef11cd2630 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -57,7 +57,7 @@
///Stores the default icon state
var/board_icon = "skateboard"
///The handheld item counterpart for the board
- var/board_item_type = /obj/item/melee/skateboard
+ var/board_item_type = /obj/item/skateboard
///Stamina drain multiplier
var/instability = 10
@@ -165,13 +165,13 @@
desc = "A RaDSTORMz brand professional skateboard. Looks a lot more stable than the average board."
icon_state = "skateboard2"
board_icon = "skateboard2"
- board_item_type = /obj/item/melee/skateboard/pro
+ board_item_type = /obj/item/skateboard/pro
instability = 6
/obj/vehicle/ridden/scooter/skateboard/hoverboard/
name = "hoverboard"
desc = "A blast from the past, so retro!"
- board_item_type = /obj/item/melee/skateboard/hoverboard
+ board_item_type = /obj/item/skateboard/hoverboard
instability = 3
icon_state = "hoverboard_red"
board_icon = "hoverboard_red"
@@ -188,7 +188,7 @@
/obj/vehicle/ridden/scooter/skateboard/hoverboard/admin
name = "\improper Board Of Directors"
desc = "The engineering complexity of a spaceship concentrated inside of a board. Just as expensive, too."
- board_item_type = /obj/item/melee/skateboard/hoverboard/admin
+ board_item_type = /obj/item/skateboard/hoverboard/admin
instability = 0
icon_state = "hoverboard_nt"
board_icon = "hoverboard_nt"
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index 3e51271093ad..18b8fd522aab 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -15,10 +15,10 @@
/obj/item/reagent_containers/food/condiment/peppermill = 5,
/obj/item/clothing/suit/apron/chef = 2,
/obj/item/kitchen/rollingpin = 2,
- /obj/item/kitchen/knife = 2,
- /obj/item/kitchen/knife/pizza_cutter = 2,
+ /obj/item/melee/knife/kitchen = 2,
+ /obj/item/melee/knife/pizza_cutter = 2,
/obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 2,
- /obj/item/kitchen/knife/butcher = 1)
+ /obj/item/melee/knife/butcher = 1)
refill_canister = /obj/item/vending_refill/dinnerware
default_price = 50
extra_price = 250
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index c803fa347e9f..e54479cd55ca 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -15,8 +15,8 @@
/obj/item/camera = 3,
/obj/item/dyespray = 3)
premium = list(
- /obj/item/melee/skateboard/pro = 3,
- /obj/item/melee/skateboard/hoverboard = 1)
+ /obj/item/skateboard/pro = 3,
+ /obj/item/skateboard/hoverboard = 1)
refill_canister = /obj/item/vending_refill/games
default_price = 50
extra_price = 250
diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
index 0677a77edb58..02a95555468f 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -11,7 +11,7 @@
/obj/item/reagent_containers/food/drinks/ice/prison = 12,
/obj/item/reagent_containers/food/snacks/candy_corn/prison = 6)
contraband = list(
- /obj/item/kitchen/knife = 6,
+ /obj/item/melee/knife/kitchen = 6,
/obj/item/reagent_containers/food/drinks/coffee = 12,
/obj/item/tank/internals/emergency_oxygen = 6,
/obj/item/clothing/mask/breath = 6)
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index da3fdb134010..4686c12da1ad 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -375,8 +375,7 @@
icon_state = "chapdrobe"
product_ads = "Are you being bothered by cultists or pesky revenants? Then come and dress like the holy man!;Clothes for men of the cloth!"
vend_reply = "Thank you for using the ChapDrobe!"
- products = list(/obj/item/storage/box/holy = 1,
- /obj/item/storage/backpack/cultpack = 1,
+ products = list(/obj/item/storage/backpack/cultpack = 1,
/obj/item/clothing/head/beret/service = 1, //WS edit - berets
/obj/item/clothing/accessory/pocketprotector/cosmetology = 1,
/obj/item/clothing/under/rank/civilian/chaplain = 1,
diff --git a/html/changelogs/AutoChangeLog-pr-3400.yml b/html/changelogs/AutoChangeLog-pr-3400.yml
deleted file mode 100644
index 3149437636dc..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3400.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PositiveEntropy
-changes:
- - {rscadd: Gorlex Splinters now have winter coats!}
-delete-after: true
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
index c3b2ce482d47..d5ef25458196 100644
--- a/html/changelogs/archive/2024-09.yml
+++ b/html/changelogs/archive/2024-09.yml
@@ -124,3 +124,83 @@
Sadhorizon:
- rscadd: Added "ballistic goggles" - new indie security clothing item.
- imageadd: Added Kepori bulletproof helmet sprites.
+2024-09-22:
+ Bjarl:
+ - code_imp: Ship Turrets can now be attached to control consoles outside the area
+ they are in. please look at ship maps for examples on how.
+ - rscadd: Every single ship with turrets now does the above
+ PositiveEntropy:
+ - rscadd: Gorlex Splinters now have winter coats!
+ Sadhorizon:
+ - bugfix: Panacea-class is no longer an independent ship.
+2024-09-23:
+ Bjarl:
+ - rscadd: You can now buy flares at the outpost
+ - rscadd: Wasteplanets now will generate concrete filled caves.
+2024-09-24:
+ Apogee-dev:
+ - balance: Changed decoration on Miskilamo ships to look similar to each other
+ - balance: reduced Kilo starting funds to 1500
+ - bugfix: fixed wires on Mudskipper
+ Bjarl:
+ - bugfix: turrets will now _actually_ connect to their console. i swear im a real
+ coder.
+ FalloutFalcon:
+ - code_imp: bunch of code organization related to melee
+ - refactor: cleaned up a bunch of melee items to have better inheritance and paths
+ PositiveEntropy:
+ - imageadd: Resprites all balaclavas!
+ Thera-Pissed:
+ - rscdel: unused did_fire var
+ - rscdel: B.E.P.I.S. and related tech nodes.
+ rye, erika:
+ - rscadd: concrete jugs have been replaced by much more appropriate concrete bags,
+ jee, i hope whoever made *that* blunder got fired.
+ thgvr:
+ - balance: Colossus now only has 2 recruit slots instead of a whopping !!5!!
+ - rscadd: A bunch of kepori underwear have sprites now
+ trazodont:
+ - bugfix: miso soup spelling error
+ zimon9:
+ - rscadd: Adds a bit more contrast to the output of health analyzers
+2024-09-25:
+ Jedi-Toothpaste:
+ - bugfix: Added windows to the mudskipper and shetland's engines.
+ - bugfix: Adjusted the blast doors which open on the Shetland's engines.
+ SomeguyManperson:
+ - bugfix: sawn off illestren/improvised shotgun stats are now consistent if they
+ are spawned in
+2024-09-26:
+ FalloutFalcon:
+ - rscadd: Added new blank shells for training drills!
+ - refactor: Minor refactor of design disks to reduce repeated code
+ - rscadd: Ballistics now have a minimum recoil, not enough to mess up your shot!
+ - bugfix: ships now start closed. shiptesters be writing there memos and ship names.
+ - rscadd: You can now see ships in the orbit menu and its alot prettier!
+ - code_imp: ported tg points of interest and a much improved orbit menu
+ Gristlebee:
+ - bugfix: fixes wall deconstruction causing runtimes
+ Jedi-Toothpaste:
+ - bugfix: Fixed the lack of windows for the Kilo's Thrusters, and fixed the broken
+ link for the new blast doors.
+ generalthrax:
+ - balance: Most common accessories now fit on pants
+ - rscadd: Exosuit Recharger machines are now available from cargo
+ - balance: Rust Reds on the blackmarket are now available to a maximum of 3
+ zimon9:
+ - rscadd: Added fruit puree to vegan rations
+ - rscdel: Removed pizza crackers from vegan rations
+2024-09-27:
+ Jedi-Toothpaste:
+ - rscadd: Firelocks to the Valor-Class' Doors
+ - rscadd: Lighting to dark areas on the Valor-Class' Doors
+ - rscadd: New areas on the Valor-Class to seperate rooms
+ - rscadd: Added APC for the Surgical Area
+ PositiveEntropy:
+ - imageadd: Adjusts the inner part of the normal rabbit ears.
+2024-09-28:
+ Sadhorizon:
+ - rscadd: Added a fax machine to the Dwayne-class.
+ SomeguyManperson:
+ - bugfix: legion skulls will no longer check if they should rise up and consume
+ their owner if they are ownerless
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index bfcc9970930f..8affe54d81d4 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/underwear/species/kepori/underwear_legs_kepori.dmi b/icons/mob/clothing/underwear/species/kepori/underwear_legs_kepori.dmi
index 166e1a7624d9..133061149889 100644
Binary files a/icons/mob/clothing/underwear/species/kepori/underwear_legs_kepori.dmi and b/icons/mob/clothing/underwear/species/kepori/underwear_legs_kepori.dmi differ
diff --git a/icons/mob/clothing/underwear/species/kepori/underwear_legs_keporiOLD.dmi b/icons/mob/clothing/underwear/species/kepori/underwear_legs_keporiOLD.dmi
deleted file mode 100644
index aa9c16beb0ab..000000000000
Binary files a/icons/mob/clothing/underwear/species/kepori/underwear_legs_keporiOLD.dmi and /dev/null differ
diff --git a/icons/mob/clothing/underwear/species/kepori/underwear_torso_kepori.dmi b/icons/mob/clothing/underwear/species/kepori/underwear_torso_kepori.dmi
index 1a6a59cd5241..56c2757dc0f6 100644
Binary files a/icons/mob/clothing/underwear/species/kepori/underwear_torso_kepori.dmi and b/icons/mob/clothing/underwear/species/kepori/underwear_torso_kepori.dmi differ
diff --git a/icons/mob/inhands/misc/concrete_bag_lefthand.dmi b/icons/mob/inhands/misc/concrete_bag_lefthand.dmi
new file mode 100644
index 000000000000..9d331882dfc1
Binary files /dev/null and b/icons/mob/inhands/misc/concrete_bag_lefthand.dmi differ
diff --git a/icons/mob/inhands/misc/concrete_bag_righthand.dmi b/icons/mob/inhands/misc/concrete_bag_righthand.dmi
new file mode 100644
index 000000000000..707222f919ea
Binary files /dev/null and b/icons/mob/inhands/misc/concrete_bag_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index 41093fde051e..49732e254e41 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index a8559339cd26..9797eb3ee366 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/mob/species/human/rabbit.dmi b/icons/mob/species/human/rabbit.dmi
index fcc6599f7356..26f0cb080d22 100644
Binary files a/icons/mob/species/human/rabbit.dmi and b/icons/mob/species/human/rabbit.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 403b198c179b..ec5f14748540 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/ammo_shotshells.dmi b/icons/obj/ammo_shotshells.dmi
index fe37023686bd..55b00cdd0b21 100644
Binary files a/icons/obj/ammo_shotshells.dmi and b/icons/obj/ammo_shotshells.dmi differ
diff --git a/icons/obj/chemical/concrete.dmi b/icons/obj/chemical/concrete.dmi
new file mode 100644
index 000000000000..26c557e42436
Binary files /dev/null and b/icons/obj/chemical/concrete.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index cbe3366557f0..9685db38db1e 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index 1205fd888adc..d1baf327dd89 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/improvised.dmi b/icons/obj/improvised.dmi
index 43fc38a4be59..20890be4cbc1 100644
Binary files a/icons/obj/improvised.dmi and b/icons/obj/improvised.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
new file mode 100644
index 000000000000..e38eb539cf4d
Binary files /dev/null and b/icons/obj/items.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
deleted file mode 100644
index a0ceaebd8383..000000000000
Binary files a/icons/obj/items_and_weapons.dmi and /dev/null differ
diff --git a/icons/obj/mysterybox.dmi b/icons/obj/mysterybox.dmi
deleted file mode 100644
index 0023dc066376..000000000000
Binary files a/icons/obj/mysterybox.dmi and /dev/null differ
diff --git a/icons/obj/transforming_energy.dmi b/icons/obj/transforming_energy.dmi
deleted file mode 100644
index ff2f99832d1c..000000000000
Binary files a/icons/obj/transforming_energy.dmi and /dev/null differ
diff --git a/icons/obj/weapon/axe.dmi b/icons/obj/weapon/axe.dmi
new file mode 100644
index 000000000000..0ff8a4364833
Binary files /dev/null and b/icons/obj/weapon/axe.dmi differ
diff --git a/icons/obj/weapon/baton.dmi b/icons/obj/weapon/baton.dmi
new file mode 100644
index 000000000000..c39a8b4e073b
Binary files /dev/null and b/icons/obj/weapon/baton.dmi differ
diff --git a/icons/obj/weapon/blunt.dmi b/icons/obj/weapon/blunt.dmi
new file mode 100644
index 000000000000..480515bbd794
Binary files /dev/null and b/icons/obj/weapon/blunt.dmi differ
diff --git a/icons/obj/weapon/energy.dmi b/icons/obj/weapon/energy.dmi
new file mode 100644
index 000000000000..5100d715923a
Binary files /dev/null and b/icons/obj/weapon/energy.dmi differ
diff --git a/icons/obj/item/knife.dmi b/icons/obj/weapon/knife.dmi
similarity index 100%
rename from icons/obj/item/knife.dmi
rename to icons/obj/weapon/knife.dmi
diff --git a/icons/obj/weapon/misc.dmi b/icons/obj/weapon/misc.dmi
new file mode 100644
index 000000000000..9eabb2c3eaf7
Binary files /dev/null and b/icons/obj/weapon/misc.dmi differ
diff --git a/icons/obj/weapon/spear.dmi b/icons/obj/weapon/spear.dmi
new file mode 100644
index 000000000000..98b3761430ed
Binary files /dev/null and b/icons/obj/weapon/spear.dmi differ
diff --git a/icons/obj/weapon/sword.dmi b/icons/obj/weapon/sword.dmi
new file mode 100644
index 000000000000..dc8fd8fd5d7d
Binary files /dev/null and b/icons/obj/weapon/sword.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 8288edd38bea..e460d129f655 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -163,6 +163,7 @@
#include "code\__DEFINES\dcs\helpers.dm"
#include "code\__DEFINES\dcs\signals\signals.dm"
#include "code\__DEFINES\dcs\signals\signals_mod.dm"
+#include "code\__DEFINES\dcs\signals\signals_ship.dm"
#include "code\__DEFINES\dcs\signals\signals_storage.dm"
#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_carbon.dm"
#include "code\__DEFINES\dcs\signals\signals_obj\signals_object.dm"
@@ -369,6 +370,7 @@
#include "code\controllers\subsystem\persistence.dm"
#include "code\controllers\subsystem\physics.dm"
#include "code\controllers\subsystem\ping.dm"
+#include "code\controllers\subsystem\points_of_interest.dm"
#include "code\controllers\subsystem\profiler.dm"
#include "code\controllers\subsystem\radiation.dm"
#include "code\controllers\subsystem\radio.dm"
@@ -671,6 +673,7 @@
#include "code\datums\elements\lazy_fishing_spot.dm"
#include "code\datums\elements\light_blocking.dm"
#include "code\datums\elements\mobappearance.dm"
+#include "code\datums\elements\point_of_interest.dm"
#include "code\datums\elements\plant_backfire.dm"
#include "code\datums\elements\renamemob.dm"
#include "code\datums\elements\selfknockback.dm"
@@ -856,6 +859,7 @@
#include "code\game\area\areas\ruins\space.dm"
#include "code\game\area\areas\ruins\templates.dm"
#include "code\game\area\areas\ruins\wasteplanet.dm"
+#include "code\game\atom\atom_orbit.dm"
#include "code\game\gamemodes\events.dm"
#include "code\game\gamemodes\game_mode.dm"
#include "code\game\gamemodes\objective.dm"
@@ -1158,7 +1162,6 @@
#include "code\game\objects\items\cardboard_cutouts.dm"
#include "code\game\objects\items\cards_ids.dm"
#include "code\game\objects\items\cash.dm"
-#include "code\game\objects\items\chainsaw.dm"
#include "code\game\objects\items\charter.dm"
#include "code\game\objects\items\chromosome.dm"
#include "code\game\objects\items\chrono_eraser.dm"
@@ -1178,19 +1181,15 @@
#include "code\game\objects\items\dna_injector.dm"
#include "code\game\objects\items\documents.dm"
#include "code\game\objects\items\door_seal.dm"
-#include "code\game\objects\items\dualsaber.dm"
#include "code\game\objects\items\dyekit.dm"
#include "code\game\objects\items\eightball.dm"
-#include "code\game\objects\items\energyhalberd.dm"
#include "code\game\objects\items\etherealdiscoball.dm"
#include "code\game\objects\items\extinguisher.dm"
-#include "code\game\objects\items\fireaxe.dm"
#include "code\game\objects\items\flamethrower.dm"
#include "code\game\objects\items\gift.dm"
#include "code\game\objects\items\granters.dm"
#include "code\game\objects\items\handcuffs.dm"
#include "code\game\objects\items\holosign_creator.dm"
-#include "code\game\objects\items\holy_weapons.dm"
#include "code\game\objects\items\hot_potato.dm"
#include "code\game\objects\items\hourglass.dm"
#include "code\game\objects\items\inducer.dm"
@@ -1203,10 +1202,8 @@
#include "code\game\objects\items\paiwire.dm"
#include "code\game\objects\items\pet_carrier.dm"
#include "code\game\objects\items\pinpointer.dm"
-#include "code\game\objects\items\pitchfork.dm"
#include "code\game\objects\items\plushes.dm"
#include "code\game\objects\items\pneumaticCannon.dm"
-#include "code\game\objects\items\powerfist.dm"
#include "code\game\objects\items\puzzle_pieces.dm"
#include "code\game\objects\items\RCD.dm"
#include "code\game\objects\items\RCL.dm"
@@ -1220,20 +1217,15 @@
#include "code\game\objects\items\shrapnel.dm"
#include "code\game\objects\items\shuttle_creator.dm"
#include "code\game\objects\items\signs.dm"
-#include "code\game\objects\items\singularityhammer.dm"
-#include "code\game\objects\items\spear.dm"
-#include "code\game\objects\items\stunbaton.dm"
#include "code\game\objects\items\survery_handheld.dm"
#include "code\game\objects\items\taster.dm"
#include "code\game\objects\items\teleportation.dm"
-#include "code\game\objects\items\teleprod.dm"
#include "code\game\objects\items\theft_tools.dm"
#include "code\game\objects\items\toy_mechs.dm"
#include "code\game\objects\items\toys.dm"
#include "code\game\objects\items\trash.dm"
#include "code\game\objects\items\vending_items.dm"
#include "code\game\objects\items\wayfinding.dm"
-#include "code\game\objects\items\weaponry.dm"
#include "code\game\objects\items\attachments\_attachment.dm"
#include "code\game\objects\items\attachments\bayonet.dm"
#include "code\game\objects\items\attachments\laser_sight.dm"
@@ -1322,9 +1314,20 @@
#include "code\game\objects\items\implants\implanter.dm"
#include "code\game\objects\items\implants\implantpad.dm"
#include "code\game\objects\items\implants\implantuplink.dm"
+#include "code\game\objects\items\melee\chainsaw.dm"
+#include "code\game\objects\items\melee\dualsaber.dm"
#include "code\game\objects\items\melee\energy.dm"
+#include "code\game\objects\items\melee\energyhalberd.dm"
+#include "code\game\objects\items\melee\fireaxe.dm"
+#include "code\game\objects\items\melee\knife.dm"
#include "code\game\objects\items\melee\misc.dm"
+#include "code\game\objects\items\melee\powerfist.dm"
+#include "code\game\objects\items\melee\spear.dm"
+#include "code\game\objects\items\melee\stunbaton.dm"
+#include "code\game\objects\items\melee\sword.dm"
+#include "code\game\objects\items\melee\teleprod.dm"
#include "code\game\objects\items\melee\transforming.dm"
+#include "code\game\objects\items\melee\weaponry.dm"
#include "code\game\objects\items\robot\ai_upgrades.dm"
#include "code\game\objects\items\robot\robot_items.dm"
#include "code\game\objects\items\robot\robot_parts.dm"
@@ -1699,7 +1702,6 @@
#include "code\modules\antagonists\cult\cult_items.dm"
#include "code\modules\antagonists\cult\cult_structures.dm"
#include "code\modules\antagonists\cult\cult_turf_overlay.dm"
-#include "code\modules\antagonists\cult\ritual.dm"
#include "code\modules\antagonists\cult\rune_spawn_action.dm"
#include "code\modules\antagonists\cult\runes.dm"
#include "code\modules\antagonists\devil\devil.dm"
@@ -2144,7 +2146,6 @@
#include "code\modules\events\holiday\vday.dm"
#include "code\modules\events\holiday\xmas.dm"
#include "code\modules\events\wizard\aid.dm"
-#include "code\modules\events\wizard\curseditems.dm"
#include "code\modules\events\wizard\departmentrevolt.dm"
#include "code\modules\events\wizard\embeddies.dm"
#include "code\modules\events\wizard\fakeexplosion.dm"
@@ -3186,6 +3187,7 @@
#include "code\modules\reagents\reagent_containers\borghydro.dm"
#include "code\modules\reagents\reagent_containers\bottle.dm"
#include "code\modules\reagents\reagent_containers\chem_pack.dm"
+#include "code\modules\reagents\reagent_containers\concrete_bags.dm"
#include "code\modules\reagents\reagent_containers\dropper.dm"
#include "code\modules\reagents\reagent_containers\glass.dm"
#include "code\modules\reagents\reagent_containers\hypospray.dm"
@@ -3213,7 +3215,6 @@
#include "code\modules\religion\rites.dm"
#include "code\modules\requests\request.dm"
#include "code\modules\requests\requests_manager.dm"
-#include "code\modules\research\bepis.dm"
#include "code\modules\research\designs.dm"
#include "code\modules\research\destructive_analyzer.dm"
#include "code\modules\research\experimentor.dm"
diff --git a/tgui/packages/tgui/interfaces/Bepis.js b/tgui/packages/tgui/interfaces/Bepis.js
deleted file mode 100644
index 99718415ddc9..000000000000
--- a/tgui/packages/tgui/interfaces/Bepis.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import { useBackend } from '../backend';
-import {
- Box,
- Button,
- Grid,
- LabeledList,
- NumberInput,
- Section,
-} from '../components';
-import { Window } from '../layouts';
-
-export const Bepis = (props, context) => {
- const { act, data } = useBackend(context);
- const { amount } = data;
- return (
-
-
-
- act('toggle_power')}
- />
- }
- >
- All you need to know about the B.E.P.I.S. and you! The B.E.P.I.S.
- performs hundreds of tests a second using electrical and financial
- resources to invent new products, or discover new technologies
- otherwise overlooked for being too risky or too niche to produce!
-
- act('account_reset')}
- />
- }
- >
- Console is currently being operated by{' '}
- {data.account_owner ? data.account_owner : 'no one'}.
-
-
-
-
-
-
- {data.stored_cash}
-
-
- {data.accuracy_percentage}%
-
-
- {data.positive_cash_offset}
-
-
- {data.negative_cash_offset}
-
-
-
- act('amount', {
- amount: value,
- })
- }
- />
-
-
-
-
-
-
-
-
- Average technology cost: {data.mean_value}
-
- Current chance of Success: Est. {data.success_estimate}%
-
- {data.error_name && (
-
- Previous Failure Reason: Deposited cash value too low.
- Please insert more money for future success.
-
- )}
-
-
-
-
-
-
-
- );
-};
diff --git a/tgui/packages/tgui/interfaces/Orbit.js b/tgui/packages/tgui/interfaces/Orbit.js
deleted file mode 100644
index 91bf9d1f7929..000000000000
--- a/tgui/packages/tgui/interfaces/Orbit.js
+++ /dev/null
@@ -1,218 +0,0 @@
-import { createSearch } from 'common/string';
-import { multiline } from 'common/string';
-import { resolveAsset } from '../assets';
-import { useBackend, useLocalState } from '../backend';
-import {
- Box,
- Button,
- Divider,
- Flex,
- Icon,
- Input,
- Section,
-} from '../components';
-import { Window } from '../layouts';
-
-const PATTERN_NUMBER = / \(([0-9]+)\)$/;
-
-const searchFor = (searchText) =>
- createSearch(searchText, (thing) => thing.name);
-
-const compareString = (a, b) => (a < b ? -1 : a > b);
-
-const compareNumberedText = (a, b) => {
- const aName = a.name;
- const bName = b.name;
-
- // Check if aName and bName are the same except for a number at the end
- // e.g. Medibot (2) and Medibot (3)
- const aNumberMatch = aName.match(PATTERN_NUMBER);
- const bNumberMatch = bName.match(PATTERN_NUMBER);
-
- if (
- aNumberMatch &&
- bNumberMatch &&
- aName.replace(PATTERN_NUMBER, '') === bName.replace(PATTERN_NUMBER, '')
- ) {
- const aNumber = parseInt(aNumberMatch[1], 10);
- const bNumber = parseInt(bNumberMatch[1], 10);
-
- return aNumber - bNumber;
- }
-
- return compareString(aName, bName);
-};
-
-const BasicSection = (props, context) => {
- const { act } = useBackend(context);
- const { searchText, source, title } = props;
- const things = source.filter(searchFor(searchText));
- things.sort(compareNumberedText);
- return (
- source.length > 0 && (
-
- {things.map((thing) => (
-
- )
- );
-};
-
-const OrbitedButton = (props, context) => {
- const { act } = useBackend(context);
- const { color, thing } = props;
-
- return (
-
- );
-};
-
-export const Orbit = (props, context) => {
- const { act, data } = useBackend(context);
- const { alive, antagonists, auto_observe, dead, ghosts, misc, npcs } = data;
-
- const [searchText, setSearchText] = useLocalState(context, 'searchText', '');
-
- const collatedAntagonists = {};
- for (const antagonist of antagonists) {
- if (collatedAntagonists[antagonist.antag] === undefined) {
- collatedAntagonists[antagonist.antag] = [];
- }
- collatedAntagonists[antagonist.antag].push(antagonist);
- }
-
- const sortedAntagonists = Object.entries(collatedAntagonists);
- sortedAntagonists.sort((a, b) => {
- return compareString(a[0], b[0]);
- });
-
- const orbitMostRelevant = (searchText) => {
- for (const source of [
- sortedAntagonists.map(([_, antags]) => antags),
- alive,
- ghosts,
- dead,
- npcs,
- misc,
- ]) {
- const member = source
- .filter(searchFor(searchText))
- .sort(compareNumberedText)[0];
- if (member !== undefined) {
- act('orbit', { ref: member.ref });
- break;
- }
- }
- };
-
- return (
-
-
-
- {antagonists.length > 0 && (
-
- {sortedAntagonists.map(([name, antags]) => (
-
- {antags
- .filter(searchFor(searchText))
- .sort(compareNumberedText)
- .map((antag) => (
-
- ))}
-
- ))}
-
- )}
-
-
- {alive
- .filter(searchFor(searchText))
- .sort(compareNumberedText)
- .map((thing) => (
-
- ))}
-
-
-
- {ghosts
- .filter(searchFor(searchText))
- .sort(compareNumberedText)
- .map((thing) => (
-
- ))}
-
-
-
-
-
-
-
-
-
- );
-};
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitContent.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitContent.tsx
new file mode 100644
index 000000000000..f3c59a75e189
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitContent.tsx
@@ -0,0 +1,98 @@
+import { toTitleCase } from 'common/string';
+
+import { useBackend } from '../../backend';
+import { NoticeBox, Section, Stack, Table, Tooltip } from '../../components';
+
+import { getAntagCategories } from './helpers';
+import { AntagGroup, Observable, OrbitData } from './types';
+import { OrbitSection } from './OrbitSection';
+
+type ContentSection = {
+ content: Observable[];
+ title: string;
+ color?: string;
+};
+
+export const OrbitContent = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { antagonists = [], critical = [] } = data;
+ const { searchText, autoObserve } = props;
+
+ let antagGroups: AntagGroup[] = [];
+ if (antagonists.length) {
+ antagGroups = getAntagCategories(antagonists);
+ }
+
+ const sections: readonly ContentSection[] = [
+ {
+ content: data.alive,
+ title: 'Alive',
+ color: 'good',
+ },
+ {
+ content: data.dead,
+ title: 'Dead',
+ },
+ {
+ content: data.ghosts,
+ title: 'Ghosts',
+ },
+ {
+ content: data.misc,
+ title: 'Misc',
+ },
+ {
+ content: data.npcs,
+ title: 'NPCs',
+ },
+ {
+ content: data.ships,
+ title: 'Ships',
+ },
+ ];
+
+ return (
+
+
+ {critical.map((crit) => (
+
+ act('orbit', { ref: crit.ref })}
+ >
+
+
+ {toTitleCase(crit.full_name)}
+ {crit.extra}
+
+
+
+
+ ))}
+
+ {antagGroups.map(([title, members]) => (
+
+ ))}
+
+ {sections.map((section) => (
+
+ ))}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitItem.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitItem.tsx
new file mode 100644
index 000000000000..957104afa8b9
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitItem.tsx
@@ -0,0 +1,50 @@
+import { useBackend } from '../../backend';
+import { Stack, Button, Flex, Icon } from '../../components';
+
+import { capitalizeFirst } from 'common/string';
+
+import { getDisplayColor, getDisplayName } from './helpers';
+import { Antagonist, Observable, OrbitData } from './types';
+
+type Props = {
+ item: Observable | Antagonist;
+ autoObserve: boolean;
+ color: string | undefined;
+};
+
+export const OrbitItem = (props: Props, context) => {
+ const { item, autoObserve, color } = props;
+ const { full_name, icon, job, name, orbiters, ref } = item;
+
+ const { act, data } = useBackend(context);
+ const { orbiting } = data;
+
+ const selected = ref === orbiting?.ref;
+ const validIcon = !!job && !!icon && icon !== 'hudunknown';
+
+ return (
+ act('orbit', { auto_observe: autoObserve, ref })}
+ style={{
+ display: 'flex',
+ }}
+ >
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitSection.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitSection.tsx
new file mode 100644
index 000000000000..d27d9080e08d
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitSection.tsx
@@ -0,0 +1,65 @@
+import { Collapsible, Flex, Tooltip } from '../../components';
+import { isJobOrNameMatch } from './helpers';
+import { OrbitItem } from './OrbitItem';
+import { OrbitTooltip } from './OrbitTooltip';
+import { Observable } from './types';
+
+type Props = {
+ color?: string;
+ section: Observable[];
+ title: string;
+ searchQuery: string;
+ autoObserve: boolean;
+};
+
+/**
+ * Displays a collapsible with a map of observable items.
+ * Filters the results if there is a provided search query.
+ */
+export const OrbitSection = (props: Props) => {
+ const { color, section = [], title, searchQuery, autoObserve } = props;
+
+ const filteredSection = section.filter((observable) =>
+ isJobOrNameMatch(observable, searchQuery)
+ );
+
+ if (!filteredSection.length) {
+ return null;
+ }
+
+ return (
+
+
+ {filteredSection.map((item) => {
+ const content = (
+
+ );
+
+ if (!item.health && !item.extra) {
+ return content;
+ }
+
+ return (
+ }
+ key={item.ref}
+ position="bottom-start"
+ >
+ {content}
+
+ );
+ })}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitTooltip.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitTooltip.tsx
new file mode 100644
index 000000000000..0a941dcb0fb5
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitTooltip.tsx
@@ -0,0 +1,57 @@
+import { LabeledList, NoticeBox } from '../../components';
+import { Antagonist, Observable } from './types';
+
+type Props = {
+ item: Observable | Antagonist;
+};
+
+/** Displays some info on the mob as a tooltip. */
+export const OrbitTooltip = (props: Props) => {
+ const { item } = props;
+ const { extra, name, full_name, health, job } = item;
+
+ let antag;
+ if ('antag' in item) {
+ antag = item.antag;
+ }
+
+ const extraInfo = extra?.split(':');
+ const displayHealth = !!health && health >= 0 ? `${health}%` : 'Critical';
+ const showAFK = 'client' in item && !item.client;
+
+ return (
+ <>
+
+ Last Known Data
+
+
+ {extraInfo ? (
+
+ {extraInfo[1]}
+
+ ) : (
+ <>
+ {!!name && (
+ {name}
+ )}
+ {!!full_name && (
+
+ {full_name}
+
+ )}
+ {!!job && {job}}
+ {!!antag && (
+ {antag}
+ )}
+ {!!health && (
+
+ {displayHealth}
+
+ )}
+
+ )}
+ {showAFK && Away}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Orbit/constants.ts b/tgui/packages/tgui/interfaces/Orbit/constants.ts
new file mode 100644
index 000000000000..1edadc9bfe45
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Orbit/constants.ts
@@ -0,0 +1,8 @@
+export const HEALTH = {
+ Good: 69, // nice
+ Average: 19,
+ Bad: 0,
+ Crit: -30,
+ Dead: -100,
+ Ruined: -200,
+} as const;
diff --git a/tgui/packages/tgui/interfaces/Orbit/helpers.ts b/tgui/packages/tgui/interfaces/Orbit/helpers.ts
new file mode 100644
index 000000000000..7046f784cd6c
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Orbit/helpers.ts
@@ -0,0 +1,119 @@
+import { createSearch } from '../../../common/string';
+
+import { HEALTH } from './constants';
+import { AntagGroup, Antagonist, Observable } from './types';
+
+const PATTERN_NUMBER = / \(([0-9]+)\)$/;
+
+/** Return a map of strings with each antag in its antag_category */
+export const getAntagCategories = (antagonists: Antagonist[]): AntagGroup[] => {
+ const categories = new Map();
+
+ for (const player of antagonists) {
+ const { antag_group } = player;
+
+ if (!categories.has(antag_group)) {
+ categories.set(antag_group, []);
+ }
+ categories.get(antag_group)!.push(player);
+ }
+
+ const sorted = Array.from(categories.entries()).sort((a, b) => {
+ const lowerA = a[0].toLowerCase();
+ const lowerB = b[0].toLowerCase();
+
+ if (lowerA < lowerB) return -1;
+ if (lowerA > lowerB) return 1;
+ return 0;
+ });
+
+ return sorted;
+};
+
+/** Returns a disguised name in case the person is wearing someone else's ID */
+export const getDisplayName = (
+ full_name: string,
+ nickname?: string
+): string => {
+ if (!nickname) {
+ return full_name;
+ }
+
+ return nickname;
+};
+
+/** Displays color for buttons based on the health or orbiter count. */
+export const getDisplayColor = (
+ item: Observable,
+ override?: string
+): string => {
+ const { job, health, orbiters } = item;
+
+ // Things like blob camera, etc
+ if (typeof health !== 'number') {
+ return override ? 'good' : 'grey';
+ }
+
+ // Players that are AFK
+ if ('client' in item && !item.client) {
+ return 'grey';
+ }
+
+ return getHealthColor(health);
+};
+
+/** Returns the display color for certain health percentages */
+const getHealthColor = (health: number): string => {
+ switch (true) {
+ case health > HEALTH.Good:
+ return 'good';
+ case health > HEALTH.Average:
+ return 'average';
+ default:
+ return 'bad';
+ }
+};
+
+/** Checks if a full name or job title matches the search. */
+export const isJobOrNameMatch = (
+ observable: Observable,
+ searchQuery: string
+): boolean => {
+ if (!searchQuery) return true;
+
+ const { full_name, job } = observable;
+
+ return (
+ full_name?.toLowerCase().includes(searchQuery?.toLowerCase()) ||
+ job?.toLowerCase().includes(searchQuery?.toLowerCase()) ||
+ false
+ );
+};
+
+export const searchFor = (searchText) =>
+ createSearch(searchText, (thing: Observable) => thing.full_name);
+
+export const compareString = (a, b) => (a < b ? -1 : a > b);
+
+export const compareNumberedText = (a, b) => {
+ const aName = a.name;
+ const bName = b.name;
+
+ // Check if aName and bName are the same except for a number at the end
+ // e.g. Medibot (2) and Medibot (3)
+ const aNumberMatch = aName.match(PATTERN_NUMBER);
+ const bNumberMatch = bName.match(PATTERN_NUMBER);
+
+ if (
+ aNumberMatch &&
+ bNumberMatch &&
+ aName.replace(PATTERN_NUMBER, '') === bName.replace(PATTERN_NUMBER, '')
+ ) {
+ const aNumber = parseInt(aNumberMatch[1], 10);
+ const bNumber = parseInt(bNumberMatch[1], 10);
+
+ return aNumber - bNumber;
+ }
+
+ return compareString(aName, bName);
+};
diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx
new file mode 100644
index 000000000000..f0854f7bfa69
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Orbit/index.tsx
@@ -0,0 +1,86 @@
+import { multiline } from '../../../common/string';
+import { useBackend, useLocalState } from '../../backend';
+import { Button, Divider, Flex, Icon, Input, Section } from '../../components';
+import { Window } from '../../layouts';
+
+import { searchFor } from './helpers';
+import { OrbitData } from './types';
+import { OrbitContent } from './OrbitContent';
+
+export const Orbit = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ const [searchText, setSearchText] = useLocalState(context, 'searchText', '');
+ const [autoObserve, setAutoObserve] = useLocalState(
+ context,
+ 'autoObserve',
+ false
+ );
+
+ const orbitMostRelevant = () => {
+ const mostRelevant = [
+ data.antagonists,
+ data.alive,
+ data.ghosts,
+ data.dead,
+ data.npcs,
+ data.misc,
+ data.ships,
+ ]
+ .flat()
+ .filter(searchFor(searchText))
+ .sort()[0];
+
+ if (mostRelevant !== undefined) {
+ act('orbit', { ref: mostRelevant.ref });
+ }
+ };
+
+ return (
+
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Orbit/types.ts b/tgui/packages/tgui/interfaces/Orbit/types.ts
new file mode 100644
index 000000000000..4912ae10db4c
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Orbit/types.ts
@@ -0,0 +1,38 @@
+import { BooleanLike } from '../../../common/react';
+
+export type Antagonist = Observable & { antag: string; antag_group: string };
+
+export type AntagGroup = [string, Antagonist[]];
+
+export type OrbitData = {
+ alive: Observable[];
+ antagonists: Antagonist[];
+ critical: Critical[];
+ dead: Observable[];
+ ghosts: Observable[];
+ misc: Observable[];
+ npcs: Observable[];
+ ships: Observable[];
+ orbiting: Observable | null;
+ autoObserve: boolean;
+};
+
+export type Observable = {
+ full_name: string;
+ ref: string;
+ // Optionals
+} & Partial<{
+ client: BooleanLike;
+ extra: string;
+ health: number;
+ icon: string;
+ job: string;
+ name: string;
+ orbiters: number;
+}>;
+
+type Critical = {
+ extra: string;
+ full_name: string;
+ ref: string;
+};
diff --git a/tools/UpdatePaths/Scripts/2776_cultbegone.txt b/tools/UpdatePaths/Scripts/2776_cultbegone.txt
index f2297a7003e7..a4da9dcb3d80 100644
--- a/tools/UpdatePaths/Scripts/2776_cultbegone.txt
+++ b/tools/UpdatePaths/Scripts/2776_cultbegone.txt
@@ -32,12 +32,12 @@
/obj/item/toy/plush/narplush : /obj/item/toy/plush/lizardplushie
/obj/item/bedsheet/cult : /obj/item/bedsheet/dorms
-/obj/item/melee/cultblade : /obj/item/claymore/weak
-/obj/item/melee/cultblade/dagger : /obj/item/kitchen/knife/combat
-/obj/item/melee/cultblade/ghost : /obj/item/kitchen/knife/combat
-/obj/item/toy/toy_dagger : /obj/item/kitchen/knife
-/obj/item/kitchen/knife/bloodletter : /obj/item/kitchen/knife/combat
-/obj/item/kitchen/ritual : /obj/item/kitchen/knife/combat
+/obj/item/melee/cultblade : /obj/item/melee/sword/claymore/weak
+/obj/item/melee/cultblade/dagger : /obj/item/melee/knife/combat
+/obj/item/melee/cultblade/ghost : /obj/item/melee/knife/combat
+/obj/item/toy/toy_dagger : /obj/item/melee/knife/kitcken
+/obj/item/melee/knife/kitcken/bloodletter : /obj/item/melee/knife/combat
+/obj/item/kitchen/ritual : /obj/item/melee/knife/combat
/obj/item/restraints/legcuffs/bola/cult : /obj/item/restraints/legcuffs/bola
/obj/effect/rune : @DELETE
diff --git a/tools/UpdatePaths/Scripts/2932_melee.txt b/tools/UpdatePaths/Scripts/2932_melee.txt
new file mode 100644
index 000000000000..60b81ff02b18
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/2932_melee.txt
@@ -0,0 +1,17 @@
+/obj/item/kitchen/knife : /obj/item/melee/knife/kitchen {@OLD}
+/obj/item/kitchen/knife/plastic : /obj/item/melee/knife/plastic {@OLD}
+/obj/item/kitchen/knife/letter_opener : /obj/item/melee/knife/letter_opener {@OLD}
+/obj/item/kitchen/knife/combat : /obj/item/melee/knife/combat {@OLD}
+/obj/item/kitchen/knife/combat/bone : /obj/item/melee/knife/bone {@OLD}
+/obj/item/kitchen/knife/combat/survival : /obj/item/melee/knife/survival {@OLD}
+/obj/item/kitchen/knife/switchblade : /obj/item/melee/knife/switchblade {@OLD}
+/obj/item/kitchen/knife/hunting : obj/item/melee/knife/hunting {@OLD}
+/obj/item/kitchen/knife/shiv : obj/item/melee/knife/shiv {@OLD}
+
+/obj/item/spear : /obj/item/melee/spear {@OLD}
+/obj/item/spear/explosive : /obj/item/melee/spear/explosive {@OLD}
+/obj/item/spear/bonespear : /obj/item/melee/spear/bone {@OLD}
+/obj/item/melee/spear/bonespear : /obj/item/melee/spear/bone {@OLD}
+
+/obj/item/claymore : /obj/item/melee/sword/claymore {@OLD}
+/obj/item/claymore/bone : /obj/item/melee/sword/bone {@OLD}
|