diff --git a/code/ATMOSPHERICS/components/station_boiler.dm b/code/ATMOSPHERICS/components/station_boiler.dm
index 389e2d5740..8cab413d56 100644
--- a/code/ATMOSPHERICS/components/station_boiler.dm
+++ b/code/ATMOSPHERICS/components/station_boiler.dm
@@ -106,7 +106,7 @@ var/global/list/stationboilers = list() //Should only ever have one, caching to
to_chat(user, "\The [src] cannot hold more [S.name].")
return 1
-/obj/machinery/atmospherics/binary/stationboiler/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/atmospherics/binary/stationboiler/attackby(obj/item/W as obj, mob/user as mob)
add_fingerprint(user)
if(try_load_materials(user, W))
return
diff --git a/code/__defines/span_vr.dm b/code/__defines/span_vr.dm
index 6a4748e5ee..fc43ae1923 100644
--- a/code/__defines/span_vr.dm
+++ b/code/__defines/span_vr.dm
@@ -227,3 +227,6 @@
// Links!
#define span_linkify(str) ("" + str + "")
+
+// YW stuff
+#define span_wingdings(str) ("" + str + "")
diff --git a/code/_global_vars/lists/mapping.dm b/code/_global_vars/lists/mapping.dm
index a1f664f7c2..1ddf6cae97 100644
--- a/code/_global_vars/lists/mapping.dm
+++ b/code/_global_vars/lists/mapping.dm
@@ -31,19 +31,21 @@ GLOBAL_LIST_INIT(cww_dir, list( // cww_dir[dir] = counter-clockwise rotation of
48, 56, 52, 60, 49, 57, 53, 61, 50, 58, 54, 62, 51, 59, 55, 63 // UP+DOWN - Same as first line but +48
))
+// YW Addtion Start
GLOBAL_LIST_INIT(ore_types, list(
- "hematite" = /obj/item/weapon/ore/iron,
- "uranium" = /obj/item/weapon/ore/uranium,
- "gold" = /obj/item/weapon/ore/gold,
- "silver" = /obj/item/weapon/ore/silver,
- "diamond" = /obj/item/weapon/ore/diamond,
- "phoron" = /obj/item/weapon/ore/phoron,
- "platinum" = /obj/item/weapon/ore/osmium,
- "mhydrogen" = /obj/item/weapon/ore/hydrogen,
- "silicates" = /obj/item/weapon/ore/glass,
- "carbon" = /obj/item/weapon/ore/coal,
- "verdantium" = /obj/item/weapon/ore/verdantium,
- "marble" = /obj/item/weapon/ore/marble,
- "lead" = /obj/item/weapon/ore/lead,
- "rutile" = /obj/item/weapon/ore/rutile //VOREStation Add
+ "hematite" = /obj/item/ore/iron,
+ "uranium" = /obj/item/ore/uranium,
+ "gold" = /obj/item/ore/gold,
+ "silver" = /obj/item/ore/silver,
+ "diamond" = /obj/item/ore/diamond,
+ "phoron" = /obj/item/ore/phoron,
+ "platinum" = /obj/item/ore/osmium,
+ "mhydrogen" = /obj/item/ore/hydrogen,
+ "silicates" = /obj/item/ore/glass,
+ "carbon" = /obj/item/ore/coal,
+ "verdantium" = /obj/item/ore/verdantium,
+ "marble" = /obj/item/ore/marble,
+ "lead" = /obj/item/ore/lead,
+ "rutile" = /obj/item/ore/rutile //VOREStation Add
))
+// YW addition End
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 9a7c8e200d..0d2506e847 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -331,11 +331,14 @@
xenochimera_danger_display.screen_loc = ui_xenochimera_danger_display
xenochimera_danger_display.icon_state = "danger00"
hud_elements |= xenochimera_danger_display
-
+ // YW COMMENT lleill START
+ /*
lleill_display = new /obj/screen/lleill()
lleill_display.screen_loc = ui_lleill_display
lleill_display.icon_state = "lleill"
hud_elements |= lleill_display
+ */
+ // YW COMMENT lleill END
//VOREStation Addition end
ling_chem_display = new /obj/screen/ling/chems()
diff --git a/code/datums/autolathe/engineering.dm b/code/datums/autolathe/engineering.dm
index da87a256bd..f7520a1db7 100644
--- a/code/datums/autolathe/engineering.dm
+++ b/code/datums/autolathe/engineering.dm
@@ -114,5 +114,5 @@
//YW Addition Start
/datum/category_item/autolathe/engineering/rpd
name = "rapid piping device"
- path =/obj/item/weapon/pipe_dispenser
+ path =/obj/item/pipe_dispenser
//YW Addtion End
diff --git a/code/datums/autolathe/tools_yw.dm b/code/datums/autolathe/tools_yw.dm
index 5ea8ef1c7a..0c921bfe20 100644
--- a/code/datums/autolathe/tools_yw.dm
+++ b/code/datums/autolathe/tools_yw.dm
@@ -1,7 +1,7 @@
/datum/category_item/autolathe/tools/ice_pick
name = "ice pick"
- path =/obj/item/weapon/ice_pick
+ path =/obj/item/ice_pick
/datum/category_item/autolathe/tools/shovel
name = "shovel"
- path =/obj/item/weapon/shovel
\ No newline at end of file
+ path =/obj/item/shovel
diff --git a/code/datums/outfits/jobs/YW.dm b/code/datums/outfits/jobs/YW.dm
index 3c267ec5a6..cc00cf7bc9 100644
--- a/code/datums/outfits/jobs/YW.dm
+++ b/code/datums/outfits/jobs/YW.dm
@@ -1,8 +1,8 @@
/decl/hierarchy/outfit/job/blueshield
name = OUTFIT_JOB_NAME("Blueshield Guard")
uniform = /obj/item/clothing/under/yw/blueshield
- l_ear = /obj/item/device/radio/headset/heads/blueshield
+ l_ear = /obj/item/radio/headset/heads/blueshield
shoes = /obj/item/clothing/shoes/laceup
- id_type = /obj/item/weapon/card/id/blueshield
- pda_type = /obj/item/device/pda/captain
- r_hand = /obj/item/weapon/clipboard
+ id_type = /obj/item/card/id/blueshield
+ pda_type = /obj/item/pda/captain
+ r_hand = /obj/item/clipboard
diff --git a/code/datums/outfits/jobs/security_yw.dm b/code/datums/outfits/jobs/security_yw.dm
index c5a878f26e..0812de84e3 100644
--- a/code/datums/outfits/jobs/security_yw.dm
+++ b/code/datums/outfits/jobs/security_yw.dm
@@ -1,5 +1,5 @@
/decl/hierarchy/outfit/job/security/pilot
name = OUTFIT_JOB_NAME("Security Pilot")
uniform = /obj/item/clothing/under/rank/khi/sec/pilot
- id_type = /obj/item/weapon/card/id/security
- pda_type = /obj/item/device/pda/security
\ No newline at end of file
+ id_type = /obj/item/card/id/security
+ pda_type = /obj/item/pda/security
diff --git a/code/datums/supplypacks/contraband.dm b/code/datums/supplypacks/contraband.dm
index a4d926d160..5782d29bdc 100644
--- a/code/datums/supplypacks/contraband.dm
+++ b/code/datums/supplypacks/contraband.dm
@@ -76,8 +76,8 @@
),
list( //the doc,
- /obj/item/weapon/storage/firstaid/combat,
- /obj/item/weapon/reagent_containers/hypospray
+ /obj/item/storage/firstaid/combat,
+ /obj/item/reagent_containers/hypospray
),
list( //the sapper,
diff --git a/code/datums/supplypacks/misc_yw.dm b/code/datums/supplypacks/misc_yw.dm
index 6a5e26f1d0..d3e54de288 100644
--- a/code/datums/supplypacks/misc_yw.dm
+++ b/code/datums/supplypacks/misc_yw.dm
@@ -13,7 +13,7 @@
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Blueshield equipment"
access = access_blueshield_exclusive
-
+
/datum/supply_pack/misc/blueshieldweapons
name = "Blueshield Weapon Kits"
contains = list(
@@ -28,8 +28,8 @@
/datum/supply_pack/misc/bluespaceradioyw
name = "Bluespace Radio Packs"
contains = list(
- /obj/item/device/bluespaceradio/cryogaia_prelinked = 2
+ /obj/item/bluespaceradio/cryogaia_prelinked = 2
)
cost = 75
containertype = /obj/structure/closet/crate
- containername = "Bluespace Radio Packs"
\ No newline at end of file
+ containername = "Bluespace Radio Packs"
diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm
index d7d8552260..44f74d1c54 100644
--- a/code/datums/supplypacks/munitions.dm
+++ b/code/datums/supplypacks/munitions.dm
@@ -348,12 +348,12 @@
name = "Revolver Crate"
num_contained = 2
contains = list(
- /obj/item/weapon/gun/projectile/revolver/cerberus,
- /obj/item/weapon/gun/projectile/revolver/nova,
- /obj/item/weapon/gun/projectile/revolver/detective,
- /obj/item/weapon/gun/projectile/revolver/deckard,
- /obj/item/weapon/gun/projectile/revolver/mateba,
- /obj/item/weapon/gun/projectile/derringer
+ /obj/item/gun/projectile/revolver/cerberus,
+ /obj/item/gun/projectile/revolver/nova,
+ /obj/item/gun/projectile/revolver/detective,
+ /obj/item/gun/projectile/revolver/deckard,
+ /obj/item/gun/projectile/revolver/mateba,
+ /obj/item/gun/projectile/derringer
)
cost = 150
containertype = /obj/structure/closet/crate/secure
@@ -364,9 +364,9 @@
name = "Assault rifle crate"
num_contained = 2
contains = list(
- /obj/item/weapon/gun/projectile/automatic/tommygun,
- /obj/item/weapon/gun/projectile/automatic/c20r,
- /obj/item/weapon/gun/projectile/automatic/sts35
+ /obj/item/gun/projectile/automatic/tommygun,
+ /obj/item/gun/projectile/automatic/c20r,
+ /obj/item/gun/projectile/automatic/sts35
)
cost = 250
containertype = /obj/structure/closet/crate/secure
@@ -377,8 +377,8 @@
name = "Smg crate"
num_contained = 2
contains = list(
- /obj/item/weapon/gun/projectile/automatic/c20r,
- /obj/item/weapon/gun/projectile/automatic/pdw
+ /obj/item/gun/projectile/automatic/c20r,
+ /obj/item/gun/projectile/automatic/pdw
)
cost = 100
containertype = /obj/structure/closet/crate/secure
@@ -387,7 +387,7 @@
/datum/supply_pack/munitions/munitions/yw_mg
name = "Light machine gun crate"
- contains = list(/obj/item/weapon/gun/projectile/automatic/l6_saw = 1)
+ contains = list(/obj/item/gun/projectile/automatic/l6_saw = 1)
cost = 500
containertype = /obj/structure/closet/crate/secure
containername = "Light machine gun crate"
diff --git a/code/datums/supplypacks/security_yw.dm b/code/datums/supplypacks/security_yw.dm
index 1b2909556b..f303dc7de7 100644
--- a/code/datums/supplypacks/security_yw.dm
+++ b/code/datums/supplypacks/security_yw.dm
@@ -1,7 +1,7 @@
/datum/supply_pack/security/loyaltyimplants
name = "Loyalty Implant Lockbox"
contains = list(
- /obj/item/weapon/storage/lockbox/loyalty
+ /obj/item/storage/lockbox/loyalty
)
cost = 100
containertype = /obj/structure/closet/crate/secure/gear
@@ -11,11 +11,11 @@
/datum/supply_pack/security/covenantmeleeweapons
name = "Covenant melee weapon pack"
contains = list(
- /obj/item/weapon/melee/energy/elite_sword,
- /obj/item/weapon/melee/energy/elite_sword/dagger,
- /obj/item/weapon/melee/energy/elite_sword/dagger,
- /obj/item/weapon/melee/blamite/dagger,
- /obj/item/weapon/melee/blamite/dagger
+ /obj/item/melee/energy/elite_sword,
+ /obj/item/melee/energy/elite_sword/dagger,
+ /obj/item/melee/energy/elite_sword/dagger,
+ /obj/item/melee/blamite/dagger,
+ /obj/item/melee/blamite/dagger
)
cost = 200
containertype = /obj/structure/closet/crate/secure/gear
diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm
index 1c312265e3..57126f9bb4 100644
--- a/code/datums/supplypacks/supply.dm
+++ b/code/datums/supplypacks/supply.dm
@@ -201,7 +201,7 @@
/obj/item/clothing/under/rank/pilot1,
/obj/item/gun/energy/gun/protector/pilotgun/locked,
/obj/item/clothing/gloves/watch/survival,
- /obj/item/device/cataloguer/compact // YW EDIT
+ /obj/item/cataloguer/compact // YW EDIT
)
cost=20
containertype = /obj/structure/closet/crate/secure/xion
diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm
index 0b9e16abf6..7b6a0769b2 100644
--- a/code/datums/supplypacks/voidsuits.dm
+++ b/code/datums/supplypacks/voidsuits.dm
@@ -391,7 +391,7 @@
/datum/supply_pack/voidsuits/unathi_bs_yw
name = "Unathi breacher chassis"
- contains = list(/obj/item/weapon/rig/breacher) //YW Edit
+ contains = list(/obj/item/rig/breacher) //YW Edit
cost = 350
containertype = /obj/structure/closet/crate/secure
containername = "Unathi breacher chassis crate"
diff --git a/code/game/machinery/airconditioner_yw.dm b/code/game/machinery/airconditioner_yw.dm
index 1137b9ad0c..7a5a580519 100644
--- a/code/game/machinery/airconditioner_yw.dm
+++ b/code/game/machinery/airconditioner_yw.dm
@@ -33,6 +33,6 @@
disconnect_from_network()
turn_off()
return
- if(istype(I, /obj/item/device/multitool))
+ if(istype(I, /obj/item/multitool))
return
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/game/objects/items/devices/radio/encryptionkey_yw.dm b/code/game/objects/items/devices/radio/encryptionkey_yw.dm
index d54b0fc1e7..2530ecf88d 100644
--- a/code/game/objects/items/devices/radio/encryptionkey_yw.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey_yw.dm
@@ -1,4 +1,4 @@
-/obj/item/device/encryptionkey/heads/blueshield
+/obj/item/encryptionkey/heads/blueshield
name = "blueshield's encryption key"
icon_state = "hos_cypherkey"
- channels = list("Security" = 1, "Command" = 1)
\ No newline at end of file
+ channels = list("Security" = 1, "Command" = 1)
diff --git a/code/game/objects/items/devices/radio/headset_yw.dm b/code/game/objects/items/devices/radio/headset_yw.dm
index 178e4f01f1..f4e64279b3 100644
--- a/code/game/objects/items/devices/radio/headset_yw.dm
+++ b/code/game/objects/items/devices/radio/headset_yw.dm
@@ -1,5 +1,5 @@
-/obj/item/device/radio/headset/heads/blueshield
+/obj/item/radio/headset/heads/blueshield
name = "Blueshield headset"
desc = "The headset of the man who protects command's worthless lifes."
icon_state = "com_headset"
- ks2type = /obj/item/device/encryptionkey/heads/blueshield
\ No newline at end of file
+ ks2type = /obj/item/encryptionkey/heads/blueshield
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index de5d08497e..ad766a731c 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -42,7 +42,7 @@
broadcasting = 1 //yw edit starts
listening = 0
-/obj/item/device/radio/intercom/interrogation/observation
+/obj/item/radio/intercom/interrogation/observation
listening = 1
broadcasting = 0 //yw edit ends
diff --git a/code/game/objects/items/devices/radio/radio_yw.dm b/code/game/objects/items/devices/radio/radio_yw.dm
index 66072ca8db..6d1d0d5562 100644
--- a/code/game/objects/items/devices/radio/radio_yw.dm
+++ b/code/game/objects/items/devices/radio/radio_yw.dm
@@ -1,7 +1,7 @@
-/obj/item/device/bluespaceradio/cryogaia_prelinked
+/obj/item/bluespaceradio/cryogaia_prelinked
name = "bluespace radio (Cryogaia)"
- handset = /obj/item/device/radio/bluespacehandset/linked/cryogaia_prelinked
+ handset = /obj/item/radio/bluespacehandset/linked/cryogaia_prelinked
-/obj/item/device/radio/bluespacehandset/linked/cryogaia_prelinked
+/obj/item/radio/bluespacehandset/linked/cryogaia_prelinked
bs_tx_preload_id = "cryogaia_rx" //Transmit to a receiver
- bs_rx_preload_id = "cryogaia_tx" //Recveive from a transmitter
\ No newline at end of file
+ bs_rx_preload_id = "cryogaia_tx" //Recveive from a transmitter
diff --git a/code/game/objects/items/gunbox_yw.dm b/code/game/objects/items/gunbox_yw.dm
index c7d4047c74..6f7e5f56c4 100644
--- a/code/game/objects/items/gunbox_yw.dm
+++ b/code/game/objects/items/gunbox_yw.dm
@@ -6,15 +6,15 @@
/obj/item/gunbox/blueshield/attack_self(mob/living/user)
var/list/options = list()
- options["Jackhammer Revolver Shotgun (12 Gauge)"] = list(/obj/item/weapon/gun/projectile/revolvershotgun, /obj/item/ammo_magazine/m12gdrumjack, /obj/item/ammo_magazine/m12gdrumjack, /obj/item/ammo_magazine/m12gdrumjack/beanbag)
- options["WT550 Machine Pistol (9mm)"] = list(/obj/item/weapon/gun/projectile/automatic/wt550, /obj/item/ammo_magazine/m9mmt/rubber, /obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt)
- options["X01 Energy Gun (Weapon Cell)"] = list(/obj/item/weapon/gun/energy/x01, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon)
+ options["Jackhammer Revolver Shotgun (12 Gauge)"] = list(/obj/item/gun/projectile/revolvershotgun, /obj/item/ammo_magazine/m12gdrumjack, /obj/item/ammo_magazine/m12gdrumjack, /obj/item/ammo_magazine/m12gdrumjack/beanbag)
+ options["WT550 Machine Pistol (9mm)"] = list(/obj/item/gun/projectile/automatic/wt550, /obj/item/ammo_magazine/m9mmt/rubber, /obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt)
+ options["X01 Energy Gun (Weapon Cell)"] = list(/obj/item/gun/energy/x01, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon)
var/choice = input(user,"Would you prefer a Jackhammer shotgun, a WT550 Machine Pistol, or an X01 Energy Gun?") as null|anything in options
if(src && choice)
var/list/things_to_spawn = options[choice]
for(var/new_type in things_to_spawn) // Spawn all the things, the gun and the ammo.
var/atom/movable/AM = new new_type(get_turf(src))
- if(istype(AM, /obj/item/weapon/gun))
+ if(istype(AM, /obj/item/gun))
to_chat(user, "You have chosen \the [AM].")
qdel(src)
@@ -26,14 +26,14 @@
/obj/item/gunbox/blueshield/secondary/attack_self(mob/living/user)
var/list/options = list()
- options["NSCW Variable Pistol(Microbattery)"] = list(/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos)
- options["E-Gun (Weapon Cell)"] = list(/obj/item/weapon/gun/energy/gun, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon)
- options["Consul Revolver (.44)"] = list(/obj/item/weapon/gun/projectile/revolver/consul, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44/rubber)
+ options["NSCW Variable Pistol(Microbattery)"] = list(/obj/item/storage/secure/briefcase/nsfw_pack_hos)
+ options["E-Gun (Weapon Cell)"] = list(/obj/item/gun/energy/gun, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon)
+ options["Consul Revolver (.44)"] = list(/obj/item/gun/projectile/revolver/consul, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44/rubber)
var/choice = input(user,"Would you prefer an NSCW, e-gun or a revolver?") as null|anything in options
if(src && choice)
var/list/things_to_spawn = options[choice]
for(var/new_type in things_to_spawn) // Spawn all the things, the gun and the ammo.
var/atom/movable/AM = new new_type(get_turf(src))
- if(istype(AM, /obj/item/weapon/gun))
+ if(istype(AM, /obj/item/gun))
to_chat(user, "You have chosen \the [AM].")
- qdel(src)
\ No newline at end of file
+ qdel(src)
diff --git a/code/game/objects/items/weapons/RMS_vr.dm b/code/game/objects/items/weapons/RMS_vr.dm
index d1acc812ef..a0e1880ddf 100644
--- a/code/game/objects/items/weapons/RMS_vr.dm
+++ b/code/game/objects/items/weapons/RMS_vr.dm
@@ -177,7 +177,7 @@
5;new /obj/item/trash/rkibble,
10;new /obj/item/stack/tile/grass,
10;new /obj/item/stack/tile/carpet,
- 10;new /obj/item/reagent_containers/spray/waterflower
+ 10;new /obj/item/reagent_containers/spray/waterflower)
//YW EDIT: 10;new /obj/item/bikehorn,
//YW EDIT: 10;new /obj/item/storage/backpack/clown,
//YW EDIT: 10;new /obj/item/clothing/under/rank/clown,
diff --git a/code/game/objects/items/weapons/circuitboards/circuitboards_yw.dm b/code/game/objects/items/weapons/circuitboards/circuitboards_yw.dm
index 05b8a81f6d..515f3db499 100644
--- a/code/game/objects/items/weapons/circuitboards/circuitboards_yw.dm
+++ b/code/game/objects/items/weapons/circuitboards/circuitboards_yw.dm
@@ -1,5 +1,5 @@
-/obj/item/weapon/circuitboard/geiger
+/obj/item/circuitboard/geiger
name = T_BOARD("geiger counter")
- build_path = /obj/item/device/geiger/wall
+ build_path = /obj/item/geiger/wall
board_type = new /datum/frame/frame_types/geiger
- matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
\ No newline at end of file
+ matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
diff --git a/code/game/objects/items/weapons/id cards/YW_ids.dm b/code/game/objects/items/weapons/id cards/YW_ids.dm
index de166d7906..f572435f85 100644
--- a/code/game/objects/items/weapons/id cards/YW_ids.dm
+++ b/code/game/objects/items/weapons/id cards/YW_ids.dm
@@ -1,6 +1,6 @@
-/obj/item/weapon/card/id/blueshield
+/obj/item/card/id/blueshield
assignment = "Blueshield Guard"
rank= "Blueshield Guard"
//icon_state = "blueshield"
initial_sprite_stack = list("base-stamp-dark", "top-blue", "stamp-n", "pips-blue", "stripe-blue")
- preserve_item = 0
\ No newline at end of file
+ preserve_item = 0
diff --git a/code/game/objects/items/weapons/shields_yw.dm b/code/game/objects/items/weapons/shields_yw.dm
index 4cb5bd7931..d2589e9a56 100644
--- a/code/game/objects/items/weapons/shields_yw.dm
+++ b/code/game/objects/items/weapons/shields_yw.dm
@@ -11,13 +11,13 @@ obj/item/weapon/shield/riot/stun
w_class = ITEMSIZE_NORMAL
var/active = 0
/*
-/obj/item/weapon/shield/energy/IsShield()
+/obj/item/shield/energy/IsShield()
if(active)
return 1
else
return 0
*/
-/obj/item/weapon/shield/riot/tele/attack_self(mob/living/user)
+/obj/item/shield/riot/tele/attack_self(mob/living/user)
active = !active
icon_state = "teleriot[active]"
playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
@@ -44,4 +44,3 @@ obj/item/weapon/shield/riot/stun
add_fingerprint(user)
return
-
diff --git a/code/game/objects/items/weapons/storage/fancy_yw.dm b/code/game/objects/items/weapons/storage/fancy_yw.dm
index de46475791..bb94dd9c7e 100644
--- a/code/game/objects/items/weapons/storage/fancy_yw.dm
+++ b/code/game/objects/items/weapons/storage/fancy_yw.dm
@@ -1,9 +1,9 @@
-/obj/item/weapon/storage/fancy/cigarettes/yw
+/obj/item/storage/fancy/cigarettes/yw
icon = 'icons/obj/cigarettes_yw.dmi'
-/obj/item/weapon/storage/fancy/cigarettes/yw/mauser
+/obj/item/storage/fancy/cigarettes/yw/mauser
name = "\improper pack of f13 cigarettes"
desc = "A packet of 6 f13 brand cigarettes, they somehow have a faint flavor of gunpowder... And mustard gas."
description_fluff = "f13 is a side brand of the Mauser family. The Mauser brand is an old earth, German company that has managed to stay afloat throughout the years, they mainly produce projectile weapons that are known to be extremely efficient and powerful. They are also known for their Gorilla class mech which is a force to be reckoned with. They have a wide range of other branded products, including this cigarette packet."
icon_state = "MauserPacket"
- brand = "\improper Mauser"
\ No newline at end of file
+ brand = "\improper Mauser"
diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm
index d458a4ca09..06320d12a5 100644
--- a/code/game/objects/items/weapons/storage/firstaid_vr.dm
+++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm
@@ -14,7 +14,7 @@
/obj/item/storage/firstaid/regular
starts_with = list(
- /obj/item/device/healthanalyzer, /*YW EDIT*/
+ /obj/item/healthanalyzer, /*YW EDIT*/
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/bruise_pack,
diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm
index 4c579e281e..6faaad8576 100644
--- a/code/game/objects/items/weapons/traps.dm
+++ b/code/game/objects/items/weapons/traps.dm
@@ -396,6 +396,6 @@
default_material = MAT_PLASTIC
// YW ADDITION
-/obj/item/weapon/beartrap/armed
+/obj/item/beartrap/armed
icon_state = "beartrap1"
deployed = 1
diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm
index 6e4f189407..2d4ab2fc9f 100644
--- a/code/game/objects/random/mapping.dm
+++ b/code/game/objects/random/mapping.dm
@@ -2008,6 +2008,6 @@
/obj/random/multiple/legtrap/item_to_spawn()
return pick(
- prob(67);list(/obj/item/device/assembly/mousetrap/armed),
- prob(33);list(/obj/item/weapon/beartrap/armed),
+ prob(67);list(/obj/item/assembly/mousetrap/armed),
+ prob(33);list(/obj/item/beartrap/armed),
)
diff --git a/code/game/objects/random/misc_vr.dm b/code/game/objects/random/misc_vr.dm
index 5be44703b2..0e022ee8d9 100644
--- a/code/game/objects/random/misc_vr.dm
+++ b/code/game/objects/random/misc_vr.dm
@@ -327,10 +327,10 @@
prob(4);/obj/item/potion_material/solid_mist,
prob(2);/obj/item/potion_material/spider_leg,
prob(2);/obj/item/potion_material/folded_dark,
- prob(1);/obj/item/potion_material/glamour_transparent,
- prob(1);/obj/item/potion_material/glamour_shrinking,
- prob(1);/obj/item/potion_material/glamour_twinkling,
- prob(1);/obj/item/potion_material/glamour_shard
+ // YW COMMENT lleill prob(1);/obj/item/potion_material/glamour_transparent,
+ // YW COMMENT lleill prob(1);/obj/item/potion_material/glamour_shrinking,
+ // YW COMMENT lleill prob(1);/obj/item/potion_material/glamour_twinkling,
+ // YW COMMENT lleill prob(1);/obj/item/potion_material/glamour_shard
)
/obj/random/potion_base
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/antimatter_am.dm b/code/game/objects/structures/crates_lockers/closets/secure/antimatter_am.dm
index 8ced446d2d..a7fdce2d3e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/antimatter_am.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/antimatter_am.dm
@@ -6,19 +6,19 @@
New()
..()
if(prob(50))
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/device/am_shielding_container(src)
- new /obj/item/weapon/am_containment(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_shielding_container(src)
+ new /obj/item/am_containment(src)
new /obj/item/stack/cable_coil/yellow(src)
new /obj/item/stack/cable_coil(src)
- return
\ No newline at end of file
+ return
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index abd8ee025c..b6d2c525a4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -104,15 +104,15 @@
closet_appearance = /decl/closet_appearance/secure_closet/lumber
starts_with = list(
- /obj/item/device/radio/headset/headset_mine,
+ /obj/item/radio/headset/headset_mine,
/obj/item/clothing/under/overalls,
/obj/item/clothing/gloves/light_brown,
/obj/item/clothing/gloves/black,
/obj/item/clothing/shoes/black,
- /obj/item/weapon/material/knife/machete/hatchet,
- ///obj/item/weapon/gun/energy/kinetic_accelerator, temp comment out
- /obj/item/device/flashlight/lantern,
- /obj/item/weapon/shovel,
+ /obj/item/material/knife/machete/hatchet,
+ ///obj/item/gun/energy/kinetic_accelerator, temp comment out
+ /obj/item/flashlight/lantern,
+ /obj/item/shovel,
/obj/item/clothing/glasses/material,
/obj/item/clothing/suit/storage/hooded/wintercoat/miner,
/obj/item/clothing/shoes/boots/winter/mining,
@@ -120,7 +120,7 @@
/obj/structure/closet/lumber/Initialize()
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/industrial
+ starts_with += /obj/item/storage/backpack/industrial
else
- starts_with += /obj/item/weapon/storage/backpack/satchel/eng
- return ..()
\ No newline at end of file
+ starts_with += /obj/item/storage/backpack/satchel/eng
+ return ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
index b92a05f062..3538f92de8 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
@@ -5,14 +5,14 @@
storage_capacity = 2.5 * MOB_MEDIUM
starts_with = list(
- /obj/item/weapon/storage/briefcase,
- /obj/item/weapon/storage/firstaid/adv,
- /obj/item/weapon/storage/belt/security,
- /obj/item/weapon/grenade/flashbang,
- /obj/item/device/flash,
- /obj/item/weapon/reagent_containers/spray/pepper,
- /obj/item/weapon/handcuffs,
- /obj/item/weapon/melee/baton/loaded,
+ /obj/item/storage/briefcase,
+ /obj/item/storage/firstaid/adv,
+ /obj/item/storage/belt/security,
+ /obj/item/grenade/flashbang,
+ /obj/item/flash,
+ /obj/item/reagent_containers/spray/pepper,
+ /obj/item/handcuffs,
+ /obj/item/melee/baton/loaded,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses/medhud,
/obj/item/clothing/head/beret/blueshield,
@@ -37,34 +37,34 @@
storage_capacity = 2.5 * MOB_MEDIUM
starts_with = list(
- /obj/item/weapon/storage/backpack/parachute,
- /obj/item/weapon/material/knife/tacknife/survival,
+ /obj/item/storage/backpack/parachute,
+ /obj/item/material/knife/tacknife/survival,
/obj/item/clothing/head/pilot/alt,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/suit/storage/toggle/yw/secjacket,
/obj/item/clothing/under/rank/khi/sec/pilot,
/obj/item/clothing/gloves/fingerless,
- /obj/item/weapon/cartridge/security,
- /obj/item/device/radio/headset/headset_sec/alt,
- /obj/item/weapon/storage/belt/security,
+ /obj/item/cartridge/security,
+ /obj/item/radio/headset/headset_sec/alt,
+ /obj/item/storage/belt/security,
/obj/item/clothing/glasses/sunglasses/sechud,
- /obj/item/weapon/storage/box/flare,
+ /obj/item/storage/box/flare,
/obj/item/clothing/accessory/storage/webbing/combatpilot,
- /obj/item/weapon/reagent_containers/food/snacks/liquidfood,
- /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
+ /obj/item/reagent_containers/food/snacks/liquidfood,
+ /obj/item/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/clothing/head/soft/sec/corp,
/obj/item/clothing/accessory/holster/armpit,
- /obj/item/weapon/gun/energy/taser,
- /obj/item/weapon/melee/baton/loaded,
- /obj/item/weapon/cell/device/weapon,
- /obj/item/device/flashlight/maglight,
- /obj/item/device/radio
+ /obj/item/gun/energy/taser,
+ /obj/item/melee/baton/loaded,
+ /obj/item/cell/device/weapon,
+ /obj/item/flashlight/maglight,
+ /obj/item/radio
)
/obj/structure/closet/secure_closet/personal/volunteer
closet_appearance = /decl/closet_appearance/cabinet/secure
starts_with = list(
- /obj/item/device/radio/off,
- /obj/item/device/gps
- )
\ No newline at end of file
+ /obj/item/radio/off,
+ /obj/item/gps
+ )
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 58eda61987..d6f0a20f05 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -169,7 +169,7 @@
/obj/item/megaphone,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/gas/sechailer/swat/warden,
- /obj/item/weapon/gun/projectile/revolvershotgun,
+ /obj/item/gun/projectile/revolvershotgun,
/obj/item/ammo_magazine/m12gdrumjack/beanbag,
/obj/item/ammo_magazine/m12gdrumjack/beanbag)
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm
index 3156f47463..e6e0ce6c31 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm
@@ -9,15 +9,15 @@
wall_mounted = 1
starts_with = list(
- /obj/item/weapon/module/power_control,
- /obj/item/weapon/storage/toolbox/mechanical ,
- /obj/item/device/flashlight,
- /obj/item/weapon/tank/oxygen/red,
- /obj/item/weapon/storage/briefcase/inflatable,
+ /obj/item/module/power_control,
+ /obj/item/storage/toolbox/mechanical ,
+ /obj/item/flashlight,
+ /obj/item/tank/oxygen/red,
+ /obj/item/storage/briefcase/inflatable,
/obj/item/clothing/head/helmet/space/emergency,
/obj/item/clothing/suit/space/emergency)
/obj/structure/closet/medical
name = "medical supply closet"
desc = "May or may not contain medical junk."
- closet_appearance = /decl/closet_appearance/medical_yw
\ No newline at end of file
+ closet_appearance = /decl/closet_appearance/medical_yw
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index bcfd21c604..3c6fb26d80 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -307,7 +307,7 @@
name = "Cooper's Stache"
starts_with = list(
- /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 6,
+ /obj/item/reagent_containers/food/snacks/cheesewedge = 6,
/obj/item/stack/material/gold = 1)
/obj/structure/closet/crate/freezer
name = "freezer"
diff --git a/code/modules/Phorochemistry/Phorochemputer.dm b/code/modules/Phorochemistry/Phorochemputer.dm
index e2a0e9610e..5573d87a1f 100644
--- a/code/modules/Phorochemistry/Phorochemputer.dm
+++ b/code/modules/Phorochemistry/Phorochemputer.dm
@@ -6,7 +6,7 @@ var/global/list/discovered_phororeagents //list of all phororeagents discovered
icon_state = "frame-rnd"
icon_keyboard = "kb9"
icon_screen = "powerold"
- circuit = /obj/item/weapon/circuitboard/phoronics
+ circuit = /obj/item/circuitboard/phoronics
// var/turf/simulated/floor/phoronics/source
var/turf/simulated/floor/source
var/intensity = 1
@@ -184,7 +184,7 @@ var/global/list/discovered_phororeagents //list of all phororeagents discovered
return abort("ERROR: Recalibrate to locate electromagnetic tile and or telepads")
var/datum/reagent/reactant
- var/obj/item/weapon/reagent_containers/container
+ var/obj/item/reagent_containers/container
//check for beaker, and that beaker contains only one reagent
var/num_containers = 0
@@ -193,7 +193,7 @@ var/global/list/discovered_phororeagents //list of all phororeagents discovered
return abort("ERROR: Input telepad not where expected, please recalibrate")
if(!source_pad.anchored)
return abort("ERROR: Input telepad not anchored")
- for(var/obj/item/weapon/reagent_containers/R in source_pad.loc.contents)
+ for(var/obj/item/reagent_containers/R in source_pad.loc.contents)
num_containers++
container = R
@@ -203,7 +203,7 @@ var/global/list/discovered_phororeagents //list of all phororeagents discovered
"asshat", "dumbass", "fucklechuck", "scrub", "moron", "typical NT worker")
return abort("ERROR: Open reagent container, you [insult]")
- if(istype(container, /obj/item/weapon/reagent_containers/glass/beaker/noreact)) //container doesn't react, insult user
+ if(istype(container, /obj/item/reagent_containers/glass/beaker/noreact)) //container doesn't react, insult user
var/insult = pick("idiot", "failure", "ass", "scrub", "chucklefuck", \
"asshat", "dumbass", "fucklechuck", "scrub", "moron")
return abort("ERROR: Reactions don't happen in a cryostasis beaker, you [insult]")
@@ -330,7 +330,7 @@ var/global/list/discovered_phororeagents //list of all phororeagents discovered
aborting = 1
//Buildable computers stuff
-/obj/item/weapon/circuitboard/phoronics
+/obj/item/circuitboard/phoronics
name = T_BOARD("phorochemputer")
build_path = /obj/machinery/computer/phoronics
origin_tech = "programming=2;bluespace=2"
@@ -339,5 +339,5 @@ var/global/list/discovered_phororeagents //list of all phororeagents discovered
name = "phorochemputer"
id = "phorochemputer"
req_tech = list("programming" = 3, "bluespace" = 2)
- build_path = /obj/item/weapon/circuitboard/phoronics
+ build_path = /obj/item/circuitboard/phoronics
*/
diff --git a/code/modules/Phorochemistry/misc_phoronics.dm b/code/modules/Phorochemistry/misc_phoronics.dm
index b476cb5b45..8c34fdb3d3 100644
--- a/code/modules/Phorochemistry/misc_phoronics.dm
+++ b/code/modules/Phorochemistry/misc_phoronics.dm
@@ -45,20 +45,20 @@
/decl/chemical_reaction/instant/brownies/on_reaction(var/datum/reagents/holder, var/created_volume)
for(var/i = 0; i < 3; i++)
- new /obj/item/weapon/reagent_containers/food/snacks/brownies(get_turf(holder.my_atom))
+ new /obj/item/reagent_containers/food/snacks/brownies(get_turf(holder.my_atom))
return
-/obj/item/weapon/reagent_containers/food/snacks/brownies
+/obj/item/reagent_containers/food/snacks/brownies
name = "Brownies"
icon_state = "waffles"
desc = "Ovenless Brownies!"
filling_color = "#A79459"
-/obj/item/weapon/reagent_containers/food/snacks/brownies/New()
+/obj/item/reagent_containers/food/snacks/brownies/New()
..()
reagents.add_reagent("nutriment", 6)
-/obj/item/weapon/induromol
+/obj/item/induromol
name = "Hardened Induromol"
icon = 'icons/obj/mining.dmi'
icon_state = "ore_platinum"
@@ -69,4 +69,4 @@
..()
new /obj/item/clothing/suit/bio_suit/scientist( src )
- new /obj/item/clothing/head/bio_hood/scientist( src )
\ No newline at end of file
+ new /obj/item/clothing/head/bio_hood/scientist( src )
diff --git a/code/modules/Phorochemistry/phoroanalyzer.dm b/code/modules/Phorochemistry/phoroanalyzer.dm
index 7b8e96442f..1233970eb1 100644
--- a/code/modules/Phorochemistry/phoroanalyzer.dm
+++ b/code/modules/Phorochemistry/phoroanalyzer.dm
@@ -6,10 +6,10 @@
icon_state = "mixer0b"
use_power = 1
idle_power_usage = 20
- var/obj/item/weapon/reagent_containers/stored = null
+ var/obj/item/reagent_containers/stored = null
-/obj/machinery/phoroanalyzer/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob)
- if(istype(B, /obj/item/weapon/reagent_containers))
+/obj/machinery/phoroanalyzer/attackby(var/obj/item/B as obj, var/mob/user as mob)
+ if(istype(B, /obj/item/reagent_containers))
stored = B
if(stored.reagents.reagent_list.len > 1)
state("Error: Multiple reagents detected")
@@ -42,4 +42,4 @@
else
var/description = "Analysis complete - [R.name]: [R.description]"
sleep(20)
- state(description)
\ No newline at end of file
+ state(description)
diff --git a/code/modules/Phorochemistry/phorochemheat.dm b/code/modules/Phorochemistry/phorochemheat.dm
index 1af7215985..6bd1ceffaa 100644
--- a/code/modules/Phorochemistry/phorochemheat.dm
+++ b/code/modules/Phorochemistry/phorochemheat.dm
@@ -1,6 +1,6 @@
//chemistry stuff here so that it can be easily viewed/modified
-/obj/item/weapon/reagent_containers/glass/solution_tray
+/obj/item/reagent_containers/glass/solution_tray
name = "solution tray"
desc = "A small, open-topped glass container for delicate research samples. It sports a re-useable strip for labelling with a pen."
icon = 'icons/obj/device.dmi'
@@ -13,72 +13,72 @@
flags = OPENCONTAINER
unacidable = 1
-/obj/item/weapon/storage/box/solution_trays
+/obj/item/storage/box/solution_trays
name = "solution tray box"
icon_state = "solution_trays"
-/obj/item/weapon/storage/box/solution_trays/New()
+/obj/item/storage/box/solution_trays/New()
..()
- new /obj/item/weapon/reagent_containers/glass/solution_tray( src )
- new /obj/item/weapon/reagent_containers/glass/solution_tray( src )
- new /obj/item/weapon/reagent_containers/glass/solution_tray( src )
- new /obj/item/weapon/reagent_containers/glass/solution_tray( src )
- new /obj/item/weapon/reagent_containers/glass/solution_tray( src )
- new /obj/item/weapon/reagent_containers/glass/solution_tray( src )
- new /obj/item/weapon/reagent_containers/glass/solution_tray( src )
+ new /obj/item/reagent_containers/glass/solution_tray( src )
+ new /obj/item/reagent_containers/glass/solution_tray( src )
+ new /obj/item/reagent_containers/glass/solution_tray( src )
+ new /obj/item/reagent_containers/glass/solution_tray( src )
+ new /obj/item/reagent_containers/glass/solution_tray( src )
+ new /obj/item/reagent_containers/glass/solution_tray( src )
+ new /obj/item/reagent_containers/glass/solution_tray( src )
-/obj/item/weapon/reagent_containers/glass/beaker/tungsten
+/obj/item/reagent_containers/glass/beaker/tungsten
name = "beaker 'tungsten'"
-/obj/item/weapon/reagent_containers/glass/beaker/tungsten/New()
+/obj/item/reagent_containers/glass/beaker/tungsten/New()
..()
reagents.add_reagent("tungsten",50)
update_icon()
-/obj/item/weapon/reagent_containers/glass/beaker/oxygen
+/obj/item/reagent_containers/glass/beaker/oxygen
name = "beaker 'oxygen'"
-/obj/item/weapon/reagent_containers/glass/beaker/oxygen/New()
+/obj/item/reagent_containers/glass/beaker/oxygen/New()
..()
reagents.add_reagent("oxygen",50)
update_icon()
-/obj/item/weapon/reagent_containers/glass/beaker/sodium
+/obj/item/reagent_containers/glass/beaker/sodium
name = "beaker 'sodium'"
-/obj/item/weapon/reagent_containers/glass/beaker/sodium/New()
+/obj/item/reagent_containers/glass/beaker/sodium/New()
..()
reagents.add_reagent("sodium",50)
update_icon()
-/obj/item/weapon/reagent_containers/glass/beaker/lithium
+/obj/item/reagent_containers/glass/beaker/lithium
name = "beaker 'lithium'"
-/obj/item/weapon/reagent_containers/glass/beaker/lithium/New()
+/obj/item/reagent_containers/glass/beaker/lithium/New()
..()
reagents.add_reagent("lithium",50)
update_icon()
-/obj/item/weapon/reagent_containers/glass/beaker/water
+/obj/item/reagent_containers/glass/beaker/water
name = "beaker 'water'"
-/obj/item/weapon/reagent_containers/glass/beaker/water/New()
+/obj/item/reagent_containers/glass/beaker/water/New()
..()
reagents.add_reagent("water",50)
update_icon()
-/obj/item/weapon/reagent_containers/glass/beaker/water
+/obj/item/reagent_containers/glass/beaker/water
name = "beaker 'water'"
-/obj/item/weapon/reagent_containers/glass/beaker/water/New()
+/obj/item/reagent_containers/glass/beaker/water/New()
..()
reagents.add_reagent("water",50)
update_icon()
-/obj/item/weapon/reagent_containers/glass/beaker/fuel
+/obj/item/reagent_containers/glass/beaker/fuel
name = "beaker 'fuel'"
-/obj/item/weapon/reagent_containers/glass/beaker/fuel/New()
+/obj/item/reagent_containers/glass/beaker/fuel/New()
..()
reagents.add_reagent("fuel",50)
update_icon()
@@ -91,11 +91,11 @@
icon_state = "bunsen0"
var/heating = 0 //whether the bunsen is turned on
var/heated = 0 //whether the bunsen has been on long enough to let stuff react
- var/obj/item/weapon/reagent_containers/held_container
+ var/obj/item/reagent_containers/held_container
var/heat_time = 50
-/obj/machinery/bunsen_burner/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/reagent_containers))
+/obj/machinery/bunsen_burner/attackby(obj/item/W as obj, mob/user as mob)
+ if(istype(W, /obj/item/reagent_containers))
if(held_container)
user << "You must remove the [held_container] first."
else
@@ -142,4 +142,4 @@
icon_state = "bunsen[heating]"
if(heating)
spawn(heat_time)
- try_heating()
\ No newline at end of file
+ try_heating()
diff --git a/code/modules/Phorochemistry/phororeagent.dm b/code/modules/Phorochemistry/phororeagent.dm
index 9ce56d5ad3..e38521cb16 100644
--- a/code/modules/Phorochemistry/phororeagent.dm
+++ b/code/modules/Phorochemistry/phororeagent.dm
@@ -9,7 +9,7 @@ var/induromol_code = rand(1, 50)
//called by phorochemputer.dm, returns special message upon creating reagent
//mostly dangerous initial reactions, to ensure protective gear is worn
-/datum/reagent/phororeagent/proc/initial_reaction(var/obj/item/weapon/reagent_containers/container, var/turf/T, var/volume, var/message)
+/datum/reagent/phororeagent/proc/initial_reaction(var/obj/item/reagent_containers/container, var/turf/T, var/volume, var/message)
if(reagent_state == GAS)
return "WARNING: Gaseous reaction detected! Repeating reaction inadvisable."
return message
@@ -211,7 +211,7 @@ var/induromol_code = rand(1, 50)
to_chat(M, "
")
break
-/obj/item/weapon/reagent_containers/glass/beaker/lovepotion
+/obj/item/reagent_containers/glass/beaker/lovepotion
name = "beaker (amorapotio)"
prefill = list("amorapotio" = 60)
@@ -260,8 +260,8 @@ var/induromol_code = rand(1, 50)
var/mob/living/carbon/human/immune
for(var/mob/living/carbon/human/H in viewers(T, 2))
var/distTo = sqrt(((T.x - H.x) ** 2) + ((T.y - H.y) ** 2))
- if(distTo < dist && (istype(H.l_hand, /obj/item/weapon/reagent_containers) || \
- istype(H.r_hand, /obj/item/weapon/reagent_containers)))
+ if(distTo < dist && (istype(H.l_hand, /obj/item/reagent_containers) || \
+ istype(H.r_hand, /obj/item/reagent_containers)))
immune = H //so reagent spill does not affect user, they already threw up when it was created
src = null
@@ -293,7 +293,7 @@ var/induromol_code = rand(1, 50)
H.lastpuke = 0
// return ..()
-/datum/reagent/phororeagent/nasty/initial_reaction(var/obj/item/weapon/reagent_containers/container, var/turf/T, var/volume, var/message)
+/datum/reagent/phororeagent/nasty/initial_reaction(var/obj/item/reagent_containers/container, var/turf/T, var/volume, var/message)
for(var/mob/living/carbon/human/H in viewers(T, 7))
H << "There is something about the reagent from the telepad you find absolutely repulsive."
H.vomit()
@@ -649,9 +649,9 @@ var/induromol_code = rand(1, 50)
soapfoam.set_up(12, T, cleaner, 0)
soapfoam.start()
sleep(50)
- var/list/soaps = typesof(/obj/item/weapon/soap)// - /obj/item/weapon/soap/fluff/azare_siraj_1
+ var/list/soaps = typesof(/obj/item/soap)// - /obj/item/soap/fluff/azare_siraj_1
var/soap_type = pick(soaps)
- var/obj/item/weapon/soap/S = new soap_type()
+ var/obj/item/soap/S = new soap_type()
S.loc = T
if(volume >= 50)
volume -= 50
@@ -792,7 +792,7 @@ var/induromol_code = rand(1, 50)
description = "Creates an unstable electrical field between molecules"
color = "#F5EF38"
-/datum/reagent/phororeagent/energized_phoron/initial_reaction(var/obj/item/weapon/reagent_containers/container, var/turf/T, var/volume, var/message)
+/datum/reagent/phororeagent/energized_phoron/initial_reaction(var/obj/item/reagent_containers/container, var/turf/T, var/volume, var/message)
empulse(T, round(volume / 8), round(volume / 5), 1)
src = null
spawn(1)
@@ -834,7 +834,7 @@ var/induromol_code = rand(1, 50)
description = "Exhibits strange electromagnetic properties"
color = "#5D505E"
-/datum/reagent/phororeagent/obscuritol/initial_reaction(var/obj/item/weapon/reagent_containers/container, var/turf/T, var/volume, var/message)
+/datum/reagent/phororeagent/obscuritol/initial_reaction(var/obj/item/reagent_containers/container, var/turf/T, var/volume, var/message)
var/obj/machinery/light/L
for(var/obj/machinery/light/light in orange(3, T))
if(light.status != 2) //LIGHT_BROKEN
@@ -951,7 +951,7 @@ var/induromol_code = rand(1, 50)
/datum/reagent/phororeagent/gaseous
reagent_state = GAS
-/datum/reagent/phororeagent/gaseous/initial_reaction(var/obj/item/weapon/reagent_containers/container, var/turf/T, var/volume, var/message)
+/datum/reagent/phororeagent/gaseous/initial_reaction(var/obj/item/reagent_containers/container, var/turf/T, var/volume, var/message)
var/datum/effect/effect/system/smoke_spread/chem/effect = new/datum/effect/effect/system/smoke_spread/chem()
var/datum/reagents/R = new/datum/reagents()
R.my_atom = container
@@ -1155,4 +1155,4 @@ nocturnol //Should give night vision, does not seem to work using this method of
var/mob/M = A
M.see_in_dark = 2
return ..()
-*/
\ No newline at end of file
+*/
diff --git a/code/modules/Phorochemistry/phorotelepad.dm b/code/modules/Phorochemistry/phorotelepad.dm
index ccc2c75b93..34bd1aa0fc 100644
--- a/code/modules/Phorochemistry/phorotelepad.dm
+++ b/code/modules/Phorochemistry/phorotelepad.dm
@@ -24,31 +24,31 @@
//if(!M.restrained())
M.loc = dest.loc
-/obj/machinery/telepad_phoronics/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/reagent_containers))
+/obj/machinery/telepad_phoronics/attackby(obj/item/W as obj, mob/user as mob)
+ if(istype(W, /obj/item/reagent_containers))
user.drop_item()
W.loc = src.loc
- else if(istype(W, /obj/item/weapon/tool/wrench))
+ else if(istype(W, /obj/item/tool/wrench))
var/word = "tighten"
src.anchored = !src.anchored
if(!src.anchored)
word = "undo"
user << "You [word] the telepad anchor bolts."
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
- else if(istype(W, /obj/item/weapon/tool/screwdriver) && !src.anchored)
+ else if(istype(W, /obj/item/tool/screwdriver) && !src.anchored)
user << "You fold the telepad."
- new /obj/item/weapon/phoronics_telepad(src.loc)
+ new /obj/item/phoronics_telepad(src.loc)
del(src)
else
return ..()
-/obj/item/weapon/phoronics_telepad
+/obj/item/phoronics_telepad
name = "telepad"
desc = "A bluespace telepad used for teleporting objects to and from a location."
icon = 'icons/phoronics.dmi'
icon_state = "pad-folded"
-/obj/item/weapon/phoronics_telepad/attack_self(mob/user as mob)
+/obj/item/phoronics_telepad/attack_self(mob/user as mob)
user << "You unfold the pad."
var/obj/machinery/telepad_phoronics/T = new /obj/machinery/telepad_phoronics(user.loc)
T.anchored = 0
@@ -59,4 +59,4 @@
id = "phoronics_telepad"
req_tech = list("bluespace" = 2, "materials" = 3)
materials = list(MAT_STEEL = 1000)
- build_path = /obj/item/weapon/phoronics_telepad */
\ No newline at end of file
+ build_path = /obj/item/phoronics_telepad */
diff --git a/code/modules/admin/player_effects.dm b/code/modules/admin/player_effects.dm
index d3141861d9..1bb4ed7277 100644
--- a/code/modules/admin/player_effects.dm
+++ b/code/modules/admin/player_effects.dm
@@ -521,8 +521,8 @@
Tar.verbs |= /mob/living/carbon/human/proc/shapeshifter_select_wings
Tar.verbs |= /mob/living/carbon/human/proc/shapeshifter_select_tail
Tar.verbs |= /mob/living/carbon/human/proc/shapeshifter_select_ears
- Tar.verbs |= /mob/living/carbon/human/proc/lleill_select_shape //designed for non-shapeshifter mobs
- Tar.verbs |= /mob/living/carbon/human/proc/lleill_select_colour
+ // YW COMMENT OUT: Tar.verbs |= /mob/living/carbon/human/proc/lleill_select_shape //designed for non-shapeshifter mobs
+ // YW COMMENT OUT: Tar.verbs |= /mob/living/carbon/human/proc/lleill_select_colour
if("set_size")
var/mob/living/Tar = target
@@ -530,6 +530,8 @@
return
Tar.verbs |= /mob/living/proc/set_size
+// YW COMMENT lleill OUT : START
+/*
if("lleill_energy")
var/mob/living/carbon/human/Tar = target
if(!istype(Tar))
@@ -568,7 +570,8 @@
if(!istype(Tar))
return
Tar.verbs |= /mob/living/carbon/human/proc/lleill_contact
-
+*/
+// YW COMMENT lleill OUT : END
if("brutal_pred")
var/mob/living/Tar = target
if(!istype(Tar))
diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
index 58215dea6e..237ad4d2ea 100644
--- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
@@ -13,7 +13,7 @@
/*
/datum/gear/fluff/testhorn
- path = /obj/item/weapon/bikehorn
+ path = /obj/item/bikehorn
display_name = "Airhorn - Example Item" //Don't use the same as another item
description = "An example item that you probably shouldn't see!"
ckeywhitelist = list("broman2000")
@@ -65,7 +65,7 @@
character_name = list("Madoka Koto")
/datum/gear/fluff/madoka_koto_1
- path = /obj/item/weapon/oldtwohanded/spear/fluff/madoka_koto_1
+ path = /obj/item/oldtwohanded/spear/fluff/madoka_koto_1
display_name = "Madoka's spear"
description = "A 10 foot long spear, with a sturdy wooden shaft to which is attached a strange, double spiked steel blade. One is slightly larger than the other."
ckeywhitelist = list("blackangelsace")
@@ -124,7 +124,7 @@
character_name = list("Strix Hades")
/datum/gear/fluff/strix_headset
- path = /obj/item/device/radio/headset/fluff/strix
+ path = /obj/item/radio/headset/fluff/strix
display_name = "Strix\'s headset"
description = "A headset that seems custom made for a avali skull shape, the sounds coming from it are very quiet."
ckeywhitelist = list("blackangelsace")
@@ -146,7 +146,7 @@
//Plague Doctor Boye
/datum/gear/fluff/kel_plague_box
- path = /obj/item/weapon/storage/box/fluff/kelplague
+ path = /obj/item/storage/box/fluff/kelplague
display_name = "Plague Outfit Box"
description = "Yes"
ckeywhitelist = list("blackangelsace")
@@ -199,7 +199,7 @@
//captmatt4
//Payton Joghs
/datum/gear/fluff/payton_joghs_1
- path = /obj/item/weapon/material/hatchet/unathiknife/fluff/payton_joghs_1
+ path = /obj/item/material/hatchet/unathiknife/fluff/payton_joghs_1
display_name = "Payton's Knife"
description = "It appears to be a traditional unathi knife, though with 'Payton' written on the side and appearing to be made of steel."
ckeywhitelist = list("captmatt4")
@@ -232,7 +232,7 @@
//championfire
//Yuki Windroar
/datum/gear/fluff/anoki_implant
- path = /obj/item/weapon/implanter/reagent_generator/roiz/yuki
+ path = /obj/item/implanter/reagent_generator/roiz/yuki
display_name = "Egg laying implanter"
description = "This is an implant that allows the user to lay eggs."
ckeywhitelist = list("championfire")
@@ -264,7 +264,7 @@
//codavanistok
//Coda Vanistok // (Yes, I'm aware they're the same. Yes, this is correct.)
/datum/gear/fluff/coda_implant
- path = /obj/item/weapon/implanter/fluff/coda
+ path = /obj/item/implanter/fluff/coda
display_name = "Locked size implant"
description = "It seems to be locked to two settings."
ckeywhitelist = list("codavanistok")
@@ -275,7 +275,7 @@
//dameonowen
//Dameon Owen
/datum/gear/fluff/dameon_1
- path = /obj/item/weapon/reagent_containers/food/snacks/cookie/mysterious
+ path = /obj/item/reagent_containers/food/snacks/cookie/mysterious
display_name = "A mysterious cookie"
description = "DAS A BIG COOKIE!!!"
ckeywhitelist = list("dameonowen")
@@ -291,14 +291,14 @@
character_name = list("Melissa Krutz")
/datum/gear/fluff/melissa_1
- path = /obj/item/weapon/flame/lighter/zippo/fluff/melissa
+ path = /obj/item/flame/lighter/zippo/fluff/melissa
display_name = "Zippo"
description = "A custom made zippo lighter with word 'Mel' engraved in white font on the bottom right corner. It's black, with red lines around the edges."
ckeywhitelist = list("dawidoe")
character_name = list("Melissa Krutz")
/datum/gear/fluff/melissa_gun_kit
- path = /obj/item/device/modkit_conversion/fluff/melissa_gun_kit
+ path = /obj/item/modkit_conversion/fluff/melissa_gun_kit
display_name = "Melissa's modkit"
description = "A kit containing all the needed tools and parts to modify a 45 Pistol."
ckeywhitelist = list("dawidoe")
@@ -307,7 +307,7 @@
//Dopiotl
//Jeanne Petite
/datum/gear/fluff/jeans_chocolates
- path = /obj/item/weapon/storage/secure/briefcase/fluff/jeans
+ path = /obj/item/storage/secure/briefcase/fluff/jeans
display_name = "ChocoBox"
description = "M-M-M-M-MONEY SHOT"
ckeywhitelist = list("dopiotl")
@@ -321,7 +321,7 @@
//dwaggy90
//Saur Darastrix
/datum/gear/fluff/saur_rig
- path = /obj/item/weapon/rig/medical/equipped/fluff/saur
+ path = /obj/item/rig/medical/equipped/fluff/saur
display_name = "AMR-DRGN"
description = "This seems to be a highly customized Medical RIG suit, coloured black and purple, and with an added extendable plating to include a pair of wings and a tail comfortably within the suits protection. There's a nametag on the chest piece, and on the control module itself, with the name 'Saur Darastrix' on it."
ckeywhitelist = list("dwaggy90")
@@ -337,7 +337,7 @@
allowed_roles = list("Blueshield Guard")
/datum/gear/fluff/saur_dufflebag
- path = /obj/item/weapon/storage/backpack/dufflebag/fluff/saur_dufflebag
+ path = /obj/item/storage/backpack/dufflebag/fluff/saur_dufflebag
display_name = "Saur's Dufflebag"
description = "A large custom made dufflebag to fit snug between a pair of wings, fitted with custom purple straps and golden medical cross, with the name 'Saur Darastrix' written under it."
ckeywhitelist = list("dwaggy90")
@@ -368,7 +368,7 @@
//deepindigo
//Amina Dae-Kouri
/datum/gear/fluff/amina_1
- path = /obj/item/weapon/storage/bible/fluff/amina
+ path = /obj/item/storage/bible/fluff/amina
display_name = "New Space Pioneer's Bible"
description = "This one says it was printed in 2492. The name \"Eric Hayvers\" is written on the inside of the cover, crossed out. Under it is written \"Kouri, Amina, Marine Unit 14, Fifth Echelon. Service number NTN-5528928522372\""
ckeywhitelist = list("deepindigo")
@@ -379,7 +379,7 @@
//esperkin
//Sheri Calen
/datum/gear/fluff/sheri_rig_kit
- path = /obj/item/device/modkit_conversion/fluff/sheri_rig_kit
+ path = /obj/item/modkit_conversion/fluff/sheri_rig_kit
display_name = "Sheri's modkit"
description = "A kit containing all the needed tools and parts to modify a Research Director rig suit. It has a snake painted on it."
ckeywhitelist = list("esperkin")
@@ -391,14 +391,14 @@
//Foxicide
//Kaith
/datum/gear/fluff/kaith_modkit
- path = /obj/item/device/modkit_conversion/fluff/kaith_knife_kit
+ path = /obj/item/modkit_conversion/fluff/kaith_knife_kit
display_name = "Kaith's modkit"
description = "A kit containing all the needed tools and parts to modify a survival knife"
ckeywhitelist = list("foxicide")
character_name = list("Kaith")
/datum/gear/fluff/kaith_bag
- path = /obj/item/weapon/storage/backpack/fluff/kaith
+ path = /obj/item/storage/backpack/fluff/kaith
display_name = "Light duffle bag"
description = "A compact duffle bag, meant for long hikes."
ckeywhitelist = list("foxicide")
@@ -452,14 +452,14 @@
character_name = list("Amara Faell")
/datum/gear/fluff/amara_zippo
- path = /obj/item/weapon/flame/lighter/zippo/fluff/amara
+ path = /obj/item/flame/lighter/zippo/fluff/amara
display_name = "Amara's Zippo"
description = "A zippo that comes in a metallic blood red case. How the flame can be lime green is an enigma in itself."
ckeywhitelist = list("generalpantsu")
character_name = list("Amara Faell")
/datum/gear/fluff/amara_hos_kit
- path = /obj/item/device/modkit_conversion/fluff/amara_hos_kit
+ path = /obj/item/modkit_conversion/fluff/amara_hos_kit
display_name = "Amara's modkit"
description = "A kit containing all the needed tools and parts to modify a Head of security armored coat. It has a red wolf painted on it."
ckeywhitelist = list("generalpantsu")
@@ -467,7 +467,7 @@
allowed_roles = list("Head of Security")
/datum/gear/fluff/amara_belt
- path = /obj/item/weapon/storage/belt/security/tactical/amara_belt
+ path = /obj/item/storage/belt/security/tactical/amara_belt
display_name = "Mercenary belt"
description = "A sturdy military belt with a shiny buckle and a bunch of pouches."
ckeywhitelist = list("generalpantsu")
@@ -533,7 +533,7 @@
character_name = list("Samantha Quzix")
/datum/gear/fluff/sam_belt
- path = /obj/item/weapon/storage/belt/utility/fluff/sam_belt
+ path = /obj/item/storage/belt/utility/fluff/sam_belt
display_name = "Mech Pilot Belt"
description = "A white-blue toolbelt with many slots to hold tools in, seems to be made to literally be attached onto a suit."
ckeywhitelist = list("generalpantsu")
@@ -550,7 +550,7 @@
//Glitterpaws
/datum/gear/fluff/goz_whitecane
- path = /obj/item/weapon/melee/goz_whitecane
+ path = /obj/item/melee/goz_whitecane
display_name = "Telescopic White Cane."
description = "A telescoping white cane. They are commonly used by the blind or visually impaired as a mobility tool or as a courtesy to others."
ckeywhitelist = list("gozulio")
@@ -598,7 +598,7 @@
//Raja Bastet
/datum/gear/fluff/raja_belt
- path = /obj/item/weapon/storage/belt/utility/fluff/raja_belt
+ path = /obj/item/storage/belt/utility/fluff/raja_belt
display_name = "Mech Engineer Belt"
description = "A black-golden toolbelt with many slots to hold tools in. Also comes with a blue buckle."
ckeywhitelist = list("izac112")
@@ -697,7 +697,7 @@
//lukevale
//Mira Rezus
/datum/gear/fluff/mira_1
- path = /obj/item/weapon/implanter/reagent_generator/mira
+ path = /obj/item/implanter/reagent_generator/mira
display_name = "Mira's implanter"
description = ""
ckeywhitelist = list("lukevale")
@@ -749,7 +749,7 @@
character_name = list("Mitsuko Jiao")
/datum/gear/fluff/jiao_belt
- path = /obj/item/weapon/storage/belt/medical/fluff/jiao_belt
+ path = /obj/item/storage/belt/medical/fluff/jiao_belt
display_name = "Navy medical belt"
description = "A customized medical belt to sport the navy colors of the Kanghu force."
ckeywhitelist = list("lukevale")
@@ -763,21 +763,21 @@
character_name = list("Mitsuko Jiao")
/datum/gear/fluff/jiao_anynlizer_kit_a
- path = /obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/a
+ path = /obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/a
display_name = "Mitsuko's modkit Mk1"
description = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
ckeywhitelist = list("lukevale")
character_name = list("Mitsuko Jiao")
/datum/gear/fluff/jiao_anynlizer_kit_b
- path = /obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/b
+ path = /obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/b
display_name = "Mitsuko's modkit Mk2"
description = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
ckeywhitelist = list("lukevale")
character_name = list("Mitsuko Jiao")
/datum/gear/fluff/jiao_anynlizer_kit_c
- path = /obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/c
+ path = /obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/c
display_name = "Mitsuko's modkit Mk3"
description = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
ckeywhitelist = list("lukevale")
@@ -805,7 +805,7 @@
allowed_roles = list("Explorer", "Pathfinder")
/datum/gear/fluff/mocha_suit_kit
- path = /obj/item/device/modkit_conversion/fluff/mocha_suit_kit
+ path = /obj/item/modkit_conversion/fluff/mocha_suit_kit
display_name = "Mocha's modkit"
description = "A kit containing all the needed tools and parts to modify a Explorer Suit"
ckeywhitelist = list("mocatheporg1")
@@ -822,7 +822,7 @@
// N CKEYS
//NESgamer190
/datum/gear/fluff/lucy_flask
- path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/lucyprice
+ path = /obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/lucyprice
display_name = "Cryostasis Thermos"
description = "A thermos that has been designed to look something akin to a mix between a cryostasis beaker and a thermos. Does NOT keep the drinks cold, surprisingly enough.."
ckeywhitelist = list("nesgamer190")
@@ -890,7 +890,7 @@
ckeywhitelist = list("radiantflash")
character_name = list("Vasharr Zahirn")
/datum/gear/fluff/vasharr_coffee
- path = /obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee
+ path = /obj/item/reagent_containers/food/drinks/bluespace_coffee
display_name = "Bluespace Coffee"
description = "Dreamt up in a strange feverish dream, this coffee cup seems to have been heavily modified with a variety of unlikely parts and wires, and never seems to run out of coffee. Truly the differance between madmen and genius is success."
ckeywhitelist = list("radiantflash")
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index 52101727b7..e3e93b2938 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -216,7 +216,7 @@
desc = "A cheap and oddly-shaped pressure suit made for vox crewmembers."
icon = 'icons/inventory/suit/mob_yw.dmi'
icon_state = "vox-civ-assistant"
- allowed = list(/obj/item/weapon/tank,/obj/item/weapon/pen,/obj/item/device/flashlight/pen)
+ allowed = list(/obj/item/tank,/obj/item/pen,/obj/item/flashlight/pen)
armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 100, rad = 25)
pressure_resistance = 5 * ONE_ATMOSPHERE
@@ -309,7 +309,7 @@
desc = "A cheap and oddly-shaped pressure suit made for vox crewmembers. This one comes with more radiation protection."
icon_state = "vox-civ-engineer"
armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 100, rad = 50)
- allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/tool)
+ allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rcd, /obj/item/tool)
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
pressure_resistance = 200 * ONE_ATMOSPHERE
@@ -389,7 +389,7 @@
name = "vox medical pressure suit"
desc = "A cheap and oddly-shaped pressure suit made for vox crewmembers. This one is for medical personnel."
icon_state = "vox-civ-medical"
- allowed = list(/obj/item/weapon/tank,/obj/item/device/flashlight,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical)
+ allowed = list(/obj/item/tank,/obj/item/flashlight,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical)
pressure_resistance = 40 * ONE_ATMOSPHERE
/obj/item/clothing/head/helmet/space/vox/civ/medical
@@ -432,7 +432,7 @@
name = "vox paramedic pressure suit"
desc = "A cheap and oddly-shaped pressure suit made for vox crewmembers. This one is for paramedics."
icon_state = "vox-civ-paramedic"
- allowed = list(/obj/item/weapon/tank,/obj/item/device/flashlight,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical,/obj/item/roller)
+ allowed = list(/obj/item/tank,/obj/item/flashlight,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical,/obj/item/roller)
/obj/item/clothing/head/helmet/space/vox/civ/medical/paramedic
name = "vox paramedic pressure helmet"
@@ -443,7 +443,7 @@
name = "vox cmo pressure suit"
desc = "A cheap and oddly-shaped pressure suit made for vox crewmembers. This one is for the CMO."
icon_state = "vox-civ-cmo"
- allowed = list(/obj/item/weapon/tank,/obj/item/device/flashlight,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical,/obj/item/roller)
+ allowed = list(/obj/item/tank,/obj/item/flashlight,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical,/obj/item/roller)
/obj/item/clothing/head/helmet/space/vox/civ/medical/cmo
name = "vox cmo pressure helmet"
@@ -456,7 +456,7 @@
desc = "A cheap and oddly-shaped pressure suit made for vox crewmembers. This one is for security aligned vox."
icon_state = "vox-civ-security"
armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
- allowed = list(/obj/item/weapon/tank,/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/melee/baton)
+ allowed = list(/obj/item/tank,/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/melee/baton)
pressure_resistance = 40 * ONE_ATMOSPHERE
/obj/item/clothing/head/helmet/space/vox/civ/security
diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm
index ba011dfc71..2db88474a1 100644
--- a/code/modules/clothing/spacesuits/rig/suits/alien.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm
@@ -125,7 +125,7 @@
/obj/item/rig_module/self_destruct
)
-/obj/item/weapon/rig/vox/civilian
+/obj/item/rig/vox/civilian
name = "matte alien control module"
suit_type = "sinister alien"
icon_state = "voxstealth_rig"
@@ -134,8 +134,8 @@
req_access = list()
req_one_access = list()
- allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit)
+ allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit)
offline_vision_restriction = 1
initial_modules = list(
- )
\ No newline at end of file
+ )
diff --git a/code/modules/clothing/suits/aliens/teshari_yw.dm b/code/modules/clothing/suits/aliens/teshari_yw.dm
index f977bf72e3..11bafc71ee 100644
--- a/code/modules/clothing/suits/aliens/teshari_yw.dm
+++ b/code/modules/clothing/suits/aliens/teshari_yw.dm
@@ -27,7 +27,7 @@
//hooded = 1 Variable no longer exists, hood is now handled by code/modules/clothing/suit/storage/hooded.dm
action_button_name = "Toggle Cloak Hood"
hoodtype = /obj/item/clothing/head/tesh_hood
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask)
/obj/item/clothing/head/tesh_hood
name = "Cloak Hood"
@@ -570,4 +570,4 @@
name = "research director belted cloak (black)"
desc = "A soft Teshari cloak made for the Research Director"
icon_state = "tesh_beltcloak_rd2"
- item_state = "tesh_beltcloak_rd2"
\ No newline at end of file
+ item_state = "tesh_beltcloak_rd2"
diff --git a/code/modules/clothing/suits/hooded_yw.dm b/code/modules/clothing/suits/hooded_yw.dm
index a0196c05a6..77a8cb7d34 100644
--- a/code/modules/clothing/suits/hooded_yw.dm
+++ b/code/modules/clothing/suits/hooded_yw.dm
@@ -6,7 +6,7 @@
icon_override = 'icons/inventory/suit/mob_yw.dmi'
item_state = "snowsuit"
hoodtype = /obj/item/clothing/head/hood/winter/snowsuit
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask)
/obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/command
name = "command snowsuit"
@@ -14,7 +14,7 @@
item_state = "snowsuit_command"
hoodtype = /obj/item/clothing/head/hood/winter/snowsuit/command
armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/weapon/gun/energy, /obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton, /obj/item/weapon/handcuffs,/obj/item/clothing/head/helmet)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton, /obj/item/handcuffs,/obj/item/clothing/head/helmet)
/obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/security
name = "security snowsuit"
@@ -22,7 +22,7 @@
item_state = "snowsuit_security"
hoodtype = /obj/item/clothing/head/hood/winter/snowsuit/security
armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0)
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/weapon/gun/energy, /obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton, /obj/item/weapon/handcuffs,/obj/item/clothing/head/helmet)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton, /obj/item/handcuffs,/obj/item/clothing/head/helmet)
/obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/medical
name = "medical snowsuit"
@@ -30,7 +30,7 @@
item_state = "snowsuit_medical"
hoodtype = /obj/item/clothing/head/hood/winter/snowsuit/medical
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/device/analyzer,/obj/item/stack/medical, /obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/analyzer,/obj/item/stack/medical, /obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle)
/obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/engineering
name = "engineering snowsuit"
@@ -38,7 +38,7 @@
item_state = "snowsuit_engineering"
hoodtype = /obj/item/clothing/head/hood/winter/snowsuit/engineering
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/device/analyzer, /obj/item/device/flashlight, /obj/item/device/multitool, /obj/item/device/pipe_painter, /obj/item/device/radio, /obj/item/device/t_scanner, /obj/item/weapon/tool/crowbar, /obj/item/weapon/tool/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/tool/wirecutters, /obj/item/weapon/tool/wrench, /obj/item/weapon/tank/emergency/oxygen, /obj/item/clothing/mask/gas, /obj/item/taperoll/engineering)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/analyzer, /obj/item/flashlight, /obj/item/multitool, /obj/item/pipe_painter, /obj/item/radio, /obj/item/t_scanner, /obj/item/tool/crowbar, /obj/item/tool/screwdriver, /obj/item/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, /obj/item/tank/emergency/oxygen, /obj/item/clothing/mask/gas, /obj/item/taperoll/engineering)
/obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/cargo
name = "cargo snowsuit"
@@ -46,7 +46,7 @@
item_state = "snowsuit_cargo"
hoodtype = /obj/item/clothing/head/hood/winter/snowsuit/cargo
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/weapon/tank, /obj/item/device/radio, /obj/item/weapon/pickaxe, /obj/item/weapon/storage/bag/ore)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/tank, /obj/item/radio, /obj/item/pickaxe, /obj/item/storage/bag/ore)
/obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/science
name = "science snowsuit"
@@ -54,7 +54,7 @@
item_state = "snowsuit_science"
hoodtype = /obj/item/clothing/head/hood/winter/snowsuit/science
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
- allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/device/analyzer,/obj/item/stack/medical, /obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/analyzer,/obj/item/stack/medical, /obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle)
/obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/get_worn_icon_file(var/body_type, var/slot_name, var/default_icon, var/inhands)
if(body_type == SPECIES_TESHARI)
diff --git a/code/modules/clothing/suits/storage_yw.dm b/code/modules/clothing/suits/storage_yw.dm
index 3a54c7497f..46237ceb7c 100644
--- a/code/modules/clothing/suits/storage_yw.dm
+++ b/code/modules/clothing/suits/storage_yw.dm
@@ -7,7 +7,7 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
flags_inv = HIDEHOLSTER //VOREStation Add - These obviously do.
- allowed = list(/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/flashlight,/obj/item/weapon/pen,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/analyzer,/obj/item/device/radio,/obj/item/taperoll)
+ allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/flashlight,/obj/item/pen,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/taperecorder,/obj/item/analyzer,/obj/item/radio,/obj/item/taperoll)
/obj/item/clothing/suit/storage/explorer/crew
name = "\improper Explorer jacket"
diff --git a/code/modules/economy/price_list_yw.dm b/code/modules/economy/price_list_yw.dm
index 0cb7bac74f..f4253eccc8 100644
--- a/code/modules/economy/price_list_yw.dm
+++ b/code/modules/economy/price_list_yw.dm
@@ -1,4 +1,4 @@
-/obj/item/weapon/storage/fancy/cigarettes/yw/mauser
+/obj/item/storage/fancy/cigarettes/yw/mauser
price_tag = 18
/datum/reagent/drink/antidepressant_yw
diff --git a/code/modules/economy/vending_yw.dm b/code/modules/economy/vending_yw.dm
index 78712381eb..7ef45112d2 100644
--- a/code/modules/economy/vending_yw.dm
+++ b/code/modules/economy/vending_yw.dm
@@ -1,24 +1,24 @@
/obj/machinery/vending/cigarette/New()
- products += list(/obj/item/weapon/storage/fancy/cigarettes/yw/mauser = 5)
- prices += list(/obj/item/weapon/storage/fancy/cigarettes/yw/mauser = 18)
+ products += list(/obj/item/storage/fancy/cigarettes/yw/mauser = 5)
+ prices += list(/obj/item/storage/fancy/cigarettes/yw/mauser = 18)
..()
/obj/machinery/vending/food/prison
name = "Prison Nutriment Vendor"
desc = "Delicious, probably not."
icon_state = "fridge_dark"
- products = list(/obj/item/weapon/tray = 6,
- /obj/item/weapon/material/kitchen/utensil/fork = 6,
- /obj/item/weapon/material/knife/plastic = 6,
- /obj/item/weapon/material/kitchen/utensil/spoon = 6,
- /obj/item/weapon/reagent_containers/food/snacks/bugball = 10,
- /obj/item/weapon/reagent_containers/food/snacks/candy_corn = 30,
- /obj/item/weapon/reagent_containers/food/snacks/tofu = 10,
- /obj/item/weapon/reagent_containers/food/snacks/wishsoup = 10,
- /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 2,
- /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 10,
+ products = list(/obj/item/tray = 6,
+ /obj/item/material/kitchen/utensil/fork = 6,
+ /obj/item/material/knife/plastic = 6,
+ /obj/item/material/kitchen/utensil/spoon = 6,
+ /obj/item/reagent_containers/food/snacks/bugball = 10,
+ /obj/item/reagent_containers/food/snacks/candy_corn = 30,
+ /obj/item/reagent_containers/food/snacks/tofu = 10,
+ /obj/item/reagent_containers/food/snacks/wishsoup = 10,
+ /obj/item/reagent_containers/food/snacks/candy/proteinbar = 2,
+ /obj/item/reagent_containers/food/snacks/liquidfood = 10,
)
- contraband = list(/obj/item/weapon/reagent_containers/food/snacks/tofupie = 3)
+ contraband = list(/obj/item/reagent_containers/food/snacks/tofupie = 3)
vend_delay = 15
/obj/machinery/vending/security/yw
@@ -27,8 +27,8 @@
product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
icon_state = "sec"
req_access = list(access_security)
- products = list(/obj/item/weapon/handcuffs = 8,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash = 5,
- /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 12,/obj/item/weapon/storage/box/evidence = 6)
- contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/weapon/storage/box/donut = 2)
+ products = list(/obj/item/handcuffs = 8,/obj/item/grenade/flashbang = 4,/obj/item/flash = 5,
+ /obj/item/reagent_containers/food/snacks/donut/plain = 12,/obj/item/storage/box/evidence = 6)
+ contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/box/donut = 2)
req_log_access = access_armory
- has_logs = 1
\ No newline at end of file
+ has_logs = 1
diff --git a/code/modules/hydroponics/seed_machines_yw.dm b/code/modules/hydroponics/seed_machines_yw.dm
index ce406cbb53..979426d2f5 100644
--- a/code/modules/hydroponics/seed_machines_yw.dm
+++ b/code/modules/hydroponics/seed_machines_yw.dm
@@ -4,7 +4,7 @@
desc = "A machine used to perform more specialized mutations on plant seeds. Careful not to put your face on the glass."
icon = 'icons/obj/hydroponics_machines_yw.dmi'
icon_state = "precisioneditor"
- var/obj/item/weapon/reagent_containers/glass/loaded_beaker //Currently held beaker
+ var/obj/item/reagent_containers/glass/loaded_beaker //Currently held beaker
var/screen_state = "main"
var/health = 2
//any other chems that should explicitly not be allowed to be grown from plants
@@ -41,9 +41,9 @@
/obj/machinery/botany/precisioneditor/attack_hand(mob/user as mob)
tgui_interact(user)
-/obj/machinery/botany/precisioneditor/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/botany/precisioneditor/attackby(obj/item/W as obj, mob/user as mob)
//Load a beaker into the machine, ensuring it's a beaker first
- if(istype(W,/obj/item/weapon/reagent_containers/glass))
+ if(istype(W,/obj/item/reagent_containers/glass))
if(loaded_beaker)
to_chat(user, "There is already a beaker loaded.")
else
diff --git a/code/modules/instruments/stationary.dm b/code/modules/instruments/stationary.dm
index a8ec40799f..a1169bf9fc 100644
--- a/code/modules/instruments/stationary.dm
+++ b/code/modules/instruments/stationary.dm
@@ -17,7 +17,7 @@
/obj/structure/musician/attack_hand(mob/M)
if(!M.IsAdvancedToolUser())
return
-
+
interact(M)
/obj/structure/musician/proc/should_stop_playing(mob/user)
@@ -59,7 +59,7 @@
icon_state = "piano"
// YW Addition: makes it so you can move the piano using the wrench
-/obj/structure/musician/piano/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/musician/piano/attackby(obj/item/W as obj, mob/user as mob)
if(!W.is_wrench())
return FALSE
playsound(src, W.usesound, 50, 1)
@@ -74,4 +74,4 @@
"You [anchored ? "un" : ""]secure \the [src].")
anchored = !anchored
update_icon()
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/modules/interserver shipping/testing_shenanigans.dm b/code/modules/interserver shipping/testing_shenanigans.dm
index 1130957a38..2ec55a1fae 100644
--- a/code/modules/interserver shipping/testing_shenanigans.dm
+++ b/code/modules/interserver shipping/testing_shenanigans.dm
@@ -96,7 +96,7 @@
var/list/shit_to_send = list()
for (var/i = 0; i < count; i++)
- var/obj/item/weapon/beach_ball/A = new(usr.loc)
+ var/obj/item/beach_ball/A = new(usr.loc)
shit_to_send += A
var/datum/shipping_request/ship
@@ -106,4 +106,4 @@
usr << ":REE: [e]"
shipping_contacts["origin"]["[ship.request_id]"] = ship
- usr << "Created"
\ No newline at end of file
+ usr << "Created"
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index ddf11957fc..fafa44295c 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -351,7 +351,7 @@ var/list/holder_mob_icon_cache = list()
slot_flags = SLOT_BACK
//YW Addition Start - Holder code for tesh
-/obj/item/weapon/holder/human/Initialize(mapload, mob/held)
+/obj/item/holder/human/Initialize(mapload, mob/held)
. = ..()
// Generate appropriate on-mob icons.
var/mob/living/carbon/human/owner = held
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 50d6e1953f..c1c48e0637 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -121,7 +121,7 @@ var/list/channel_to_radio_key = new
//VOREStation Edit End
//YW Edit start
if(wingdings)
- S.message = span("wingdings",(S.message))
+ S.message = span_wingdings(S.message)
. = 1
//YW Edit End
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_yw.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_yw.dm
index e27175d794..5b4065eb2e 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_yw.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_yw.dm
@@ -1,7 +1,7 @@
/*TEST*/
/******/
-/obj/item/device/dogborg/pounce_module
+/obj/item/dogborg/pounce_module
name = "pounce module"
icon = 'icons/mob/dogborg_vr.dmi'
icon_state = "pounce"
@@ -9,14 +9,14 @@
throwforce = 0 //This shouldn't be thrown in the first place.
w_class = ITEMSIZE_NORMAL
-/obj/item/device/dogborg/pounce_module/New()
+/obj/item/dogborg/pounce_module/New()
..()
flags |= NOBLUDGEON //No more attack messages
-/obj/item/device/dogborg/pounce_module/attack_self(mob/user)
+/obj/item/dogborg/pounce_module/attack_self(mob/user)
return
-/obj/item/device/dogborg/pounce_module/afterattack(atom/target, mob/user as mob, proximity)
+/obj/item/dogborg/pounce_module/afterattack(atom/target, mob/user as mob, proximity)
if(proximity && ishuman(target))
user.visible_message("\the [user] pounces at \the [target]'s face!", "You pounce at \the [target]!")
var/mob/living/L = target
diff --git a/code/modules/mob/living/silicon/robot/robot_modules_yw.dm b/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
index c0f3768e69..f289e835e5 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
@@ -1,11 +1,11 @@
// YW TODO: Fix this shit
/hook/startup/proc/robot_modules_yw()
- robot_modules["XenoMaid"] = /obj/item/weapon/robot_module/xenomaid
- robot_modules["Blade"] = /obj/item/weapon/robot_module/blade
- robot_modules["Surgeryhound"] = /obj/item/weapon/robot_module/surgeryhound
+ robot_modules["XenoMaid"] = /obj/item/robot_module/xenomaid
+ robot_modules["Blade"] = /obj/item/robot_module/blade
+ robot_modules["Surgeryhound"] = /obj/item/robot_module/surgeryhound
return 1
-/obj/item/weapon/robot_module/xenomaid
+/obj/item/robot_module/xenomaid
name = "Xenomorph Maid module"
channels = "Service"
sprites = list(
@@ -13,13 +13,13 @@
)
can_be_pushed = 0
-/obj/item/weapon/robot_module/xenomaid/New(var/mob/living/silicon/robot/R)
- src.modules += new /obj/item/device/flash(src)
- src.modules += new /obj/item/weapon/soap/nanotrasen(src)
- src.modules += new /obj/item/weapon/storage/bag/trash(src)
- src.modules += new /obj/item/weapon/mop(src)
- src.modules += new /obj/item/device/lightreplacer(src)
- src.emag = new /obj/item/weapon/reagent_containers/spray(src)
+/obj/item/robot_module/xenomaid/New(var/mob/living/silicon/robot/R)
+ src.modules += new /obj/item/flash(src)
+ src.modules += new /obj/item/soap/nanotrasen(src)
+ src.modules += new /obj/item/storage/bag/trash(src)
+ src.modules += new /obj/item/mop(src)
+ src.modules += new /obj/item/lightreplacer(src)
+ src.emag = new /obj/item/reagent_containers/spray(src)
src.emag.reagents.add_reagent("lube", 250)
src.emag.name = "Lube spray"
R.icon = 'icons/mob/robots_yw.dmi'
@@ -28,7 +28,7 @@
-/obj/item/weapon/robot_module/blade
+/obj/item/robot_module/blade
name = "Blade robot module"
sprites = list(
"Blade" = "blade",
@@ -37,23 +37,23 @@
networks = list(NETWORK_MINE)
can_be_pushed = 0
-/obj/item/weapon/robot_module/blade/New(var/mob/living/silicon/robot/R)
- src.modules += new /obj/item/weapon/dogborg/jaws/big(src) //In case there's some kind of hostile mob.
- src.modules += new /obj/item/device/dogborg/boop_module(src) //Boop people on the nose.
- src.modules += new /obj/item/device/dogborg/tongue(src) //This is so they can clean up bloody evidence after it's examined, and so they can lick crew.
- src.modules += new /obj/item/device/dogborg/sleeper/K9(src) //Eat criminals. Bring them to the brig.
- src.modules += new /obj/item/device/dogborg/pounce_module(src) //Pounce shit test
+/obj/item/robot_module/blade/New(var/mob/living/silicon/robot/R)
+ src.modules += new /obj/item/dogborg/jaws/big(src) //In case there's some kind of hostile mob.
+ src.modules += new /obj/item/dogborg/boop_module(src) //Boop people on the nose.
+ src.modules += new /obj/item/dogborg/tongue(src) //This is so they can clean up bloody evidence after it's examined, and so they can lick crew.
+ src.modules += new /obj/item/dogborg/sleeper/K9(src) //Eat criminals. Bring them to the brig.
+ src.modules += new /obj/item/dogborg/pounce_module(src) //Pounce shit test
src.modules += new /obj/item/borg/sight/material(src)
- src.modules += new /obj/item/weapon/tool/wrench(src)
- src.modules += new /obj/item/weapon/tool/screwdriver(src)
- src.modules += new /obj/item/weapon/storage/bag/ore(src)
- src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
- src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
- src.modules += new /obj/item/weapon/gripper/miner(src)
- src.modules += new /obj/item/weapon/mining_scanner(src)
- src.modules += new /obj/item/weapon/tool/crowbar(src)
- src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
- src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem.
+ src.modules += new /obj/item/tool/wrench(src)
+ src.modules += new /obj/item/tool/screwdriver(src)
+ src.modules += new /obj/item/storage/bag/ore(src)
+ src.modules += new /obj/item/pickaxe/borgdrill(src)
+ src.modules += new /obj/item/storage/bag/sheetsnatcher/borg(src)
+ src.modules += new /obj/item/gripper/miner(src)
+ src.modules += new /obj/item/mining_scanner(src)
+ src.modules += new /obj/item/tool/crowbar(src)
+ src.emag = new /obj/item/pickaxe/plasmacutter(src)
+ src.emag = new /obj/item/gun/energy/laser/mounted(src) //Emag. Not a big problem.
R.icon = 'icons/mob/widerobot_yw.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
R.pixel_x = -16
@@ -61,7 +61,7 @@
..()
-/obj/item/weapon/robot_module/surgeryhound
+/obj/item/robot_module/surgeryhound
name = "SurgeryHound module"
channels = list("medical" = 1)
networks = list (NETWORK_MEDICAL)
@@ -72,33 +72,33 @@
"Dark Medical Hound (Static)" = "medihounddark"
)
-/obj/item/weapon/robot_module/surgeryhound/New(var/mob/living/silicon/robot/R)
- src.modules += new /obj/item/weapon/dogborg/jaws/small(src) //In case a patient is being attacked by carp.
- src.modules += new /obj/item/device/dogborg/boop_module(src) //Boop the crew.
- src.modules += new /obj/item/device/dogborg/tongue(src) //Clean up bloody items by licking them, and eat rubbish for
- src.modules += new /obj/item/device/dogborg/sleeper(src) //So they can nom people and heal them
+/obj/item/robot_module/surgeryhound/New(var/mob/living/silicon/robot/R)
+ src.modules += new /obj/item/dogborg/jaws/small(src) //In case a patient is being attacked by carp.
+ src.modules += new /obj/item/dogborg/boop_module(src) //Boop the crew.
+ src.modules += new /obj/item/dogborg/tongue(src) //Clean up bloody items by licking them, and eat rubbish for
+ src.modules += new /obj/item/dogborg/sleeper(src) //So they can nom people and heal them
src.modules += new /obj/item/borg/sight/hud/med(src)
- src.modules += new /obj/item/device/healthanalyzer(src)
- src.modules += new /obj/item/weapon/reagent_containers/borghypo/surgeon(src)
- src.modules += new /obj/item/weapon/surgical/scalpel(src)
- src.modules += new /obj/item/weapon/surgical/hemostat(src)
- src.modules += new /obj/item/weapon/surgical/retractor(src)
- src.modules += new /obj/item/weapon/surgical/cautery(src)
- src.modules += new /obj/item/weapon/surgical/bonegel(src)
- src.modules += new /obj/item/weapon/surgical/FixOVein(src)
- src.modules += new /obj/item/weapon/surgical/bonesetter(src)
- src.modules += new /obj/item/weapon/surgical/circular_saw(src)
- src.modules += new /obj/item/weapon/surgical/surgicaldrill(src)
- src.modules += new /obj/item/weapon/gripper/no_use/organ(src)
- src.modules += new /obj/item/weapon/gripper/medical(src)
- src.modules += new /obj/item/weapon/shockpaddles/robot(src)
- src.modules += new /obj/item/weapon/reagent_containers/dropper(src) // Allows surgeon borg to fix necrosis
- src.modules += new /obj/item/device/sleevemate(src)
- src.emag = new /obj/item/weapon/reagent_containers/spray(src)
+ src.modules += new /obj/item/healthanalyzer(src)
+ src.modules += new /obj/item/reagent_containers/borghypo/surgeon(src)
+ src.modules += new /obj/item/surgical/scalpel(src)
+ src.modules += new /obj/item/surgical/hemostat(src)
+ src.modules += new /obj/item/surgical/retractor(src)
+ src.modules += new /obj/item/surgical/cautery(src)
+ src.modules += new /obj/item/surgical/bonegel(src)
+ src.modules += new /obj/item/surgical/FixOVein(src)
+ src.modules += new /obj/item/surgical/bonesetter(src)
+ src.modules += new /obj/item/surgical/circular_saw(src)
+ src.modules += new /obj/item/surgical/surgicaldrill(src)
+ src.modules += new /obj/item/gripper/no_use/organ(src)
+ src.modules += new /obj/item/gripper/medical(src)
+ src.modules += new /obj/item/shockpaddles/robot(src)
+ src.modules += new /obj/item/reagent_containers/dropper(src) // Allows surgeon borg to fix necrosis
+ src.modules += new /obj/item/sleevemate(src)
+ src.emag = new /obj/item/reagent_containers/spray(src)
src.emag.reagents.add_reagent("pacid", 250)
src.emag.name = "Polyacid spray"
- src.modules += new /obj/item/device/dogborg/pounce_module(src) //Pounce shit test
+ src.modules += new /obj/item/dogborg/pounce_module(src) //Pounce shit test
//R.icon_state = "medihound"
R.pixel_x = -16
R.old_x = -16
@@ -120,8 +120,8 @@
R.icon = 'icons/mob/widerobot_vr.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
-/obj/item/weapon/robot_module/medical/robot/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/medical/robot/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
if(src.emag)
- var/obj/item/weapon/reagent_containers/spray/PS = src.emag
+ var/obj/item/reagent_containers/spray/PS = src.emag
PS.reagents.add_reagent("pacid", 2 * amount)
..()
diff --git a/code/modules/mob/living/simple_animal/animals/clockwork.dm b/code/modules/mob/living/simple_animal/animals/clockwork.dm
index 9236010492..20febe4410 100644
--- a/code/modules/mob/living/simple_animal/animals/clockwork.dm
+++ b/code/modules/mob/living/simple_animal/animals/clockwork.dm
@@ -38,7 +38,7 @@
say_got_target = list("Purge!","Cleanse!","Burn!")
meat_amount = 0
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/reagent_containers/food/snacks/meat
var/turns_since_scan = 0
var/mob/flee_target
@@ -149,4 +149,4 @@
icon_living = "ignis"
icon_dead = "fallen_armor"
icon_rest = "ignis"
- retaliate = 1 // In theory this will make Ignis fight back. Maybe. -RF
\ No newline at end of file
+ retaliate = 1 // In theory this will make Ignis fight back. Maybe. -RF
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm
index 3f9f6eb7b2..5ea45b6ac2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm
@@ -73,7 +73,7 @@
say_got_target = list("Purge!","Cleanse!","Burn!") */
meat_amount = 0
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/reagent_containers/food/snacks/meat
var/turns_since_scan = 0
var/mob/flee_target
@@ -237,7 +237,7 @@
charging = 1
movement_shake_radius = 3
movement_sound = 'sound/effects/mob_effects/snowbull_charge.ogg'
- visible_message(span("danger","\The [src] prepares to charge at \the [A]!"))
+ visible_message(span_warning("\The [src] prepares to charge at \the [A]!"))
update_icon()
sleep(charging_warning)
var/chargeturf = get_turf(A)
@@ -251,7 +251,7 @@
movement_shake_radius = null
movement_sound = null
update_icon()
- visible_message(span("danger", "\The [src] desists from charging at \the [A]"))
+ visible_message(span_warning("\The [src] desists from charging at \the [A]"))
return
for(var/distance = get_dist(src.loc, T), src.loc!=T && distance>0, distance--)
var/movedir = get_dir(src.loc, T)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm b/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm
index 720ad9956c..4488f85cbd 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm
@@ -1,173 +1,173 @@
-/mob/living/simple_mob/vox/armalis
- name = "serpentine alien"
- real_name = "serpentine alien"
- desc = "A one-eyed, serpentine creature, half-machine, easily nine feet from tail to beak!"
- icon = 'icons/mob/vox.dmi'
- icon_state = "armalis"
- icon_living = "armalis"
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
- minbodytemp = 0
- maxHealth = 500
- health = 500
- taser_kill = 0
- has_langs = list(LANGUAGE_VOX)
- ic_revivable = 1
- has_hands = 1
- response_harm = "slashes at the"
- harm_intent_damage = 0
- melee_damage_lower = 30
- melee_damage_upper = 40
- attack_sharp = 1
- attacktext = "slammed its enormous claws into"
- movement_cooldown = 2
-// environment_smash_flags = SMASH_LIGHT_STRUCTURES | SMASH_CONTAINERS | SMASH_WALLS // WALLS Temporary commenting, YW - Hv3
- attack_sound = 'sound/weapons/bladeslice.ogg'
- status_flags = 0
- max_oxy = 0
-
- var/armour = null
- var/amp = null
- var/quills = 3
-
-/mob/living/simple_mob/vox/armalis/death(var/gibbed = FALSE)
- ..(TRUE)
- var/turf/gloc = get_turf(loc)
- visible_message("[src] shudders violently and explodes!","You feel your body rupture!")
- gib()
- explosion(gloc, -1, -1, 3, 5)
- qdel(src)
-
-/mob/living/simple_mob/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
- base_attack_cooldown = 5
- if(O.force)
- if(O.force >= 25)
- var/damage = O.force
- if (O.damtype == HALLOSS)
- damage = 0
- health -= damage
- for(var/mob/M in viewers(src, null))
- if ((M.client && !( M.blinded )))
- M.show_message("[src] has been attacked with the [O] by [user]. ")
- else
- for(var/mob/M in viewers(src, null))
- if ((M.client && !( M.blinded )))
- M.show_message("The [O] bounces harmlessly off of [src]. ")
- else
- to_chat(usr, "This weapon is ineffective, it does no damage.")
- for(var/mob/M in viewers(src, null))
- if ((M.client && !( M.blinded )))
- M.show_message("[user] gently taps [src] with the [O]. ")
-
-/mob/living/simple_mob/vox/armalis/verb/fire_quill(mob/target as mob in oview())
- set name = "Fire quill"
- set desc = "Fires a viciously pointed quill at a high speed."
- set category = "Alien"
-
- if(quills<=0)
- return
-
- to_chat(src, "You launch a razor-sharp quill at [target]!")
- for(var/mob/O in oviewers())
- if ((O.client && !( O.blinded )))
- to_chat(O, "[src] launches a razor-sharp quill at [target]!")
-
- var/obj/item/weapon/arrow/quill/Q = new(loc)
- Q.fingerprintslast = src.ckey
- Q.throw_at(target,10,30)
- quills--
-
- spawn(100)
- to_chat(src, "You feel a fresh quill slide into place.")
- quills++
-
-/mob/living/simple_mob/vox/armalis/verb/message_mob()
- set category = "Alien"
- set name = "Commune with creature"
- set desc = "Send a telepathic message to an unlucky recipient."
-
- var/list/targets = list()
- var/target = null
- var/text = null
-
- targets += getmobs() //Fill list, prompt user with list
- for(var/key in targets)
- var/mob/mobx = targets[key]
- if(!mobx.ckey)
- targets -= key
-
- target = tgui_input_list(src, "Select a creature!", "Speak to creature", targets)
-
- if(!target) return
-
- text = tgui_input_text(src, "What would you like to say?", "Speak to creature")
-
- if (!target || !text)
- return
-
- var/mob/M = targets[target]
-
- if(istype(M, /mob/observer/dead) || M.stat == DEAD)
- to_chat(src, "Not even the armalis can speak to the dead.")
- return
-
- to_chat(M, "Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")
- if(istype(M,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- if(H.species.name == SPECIES_VOX)
- return
- to_chat(H, "Your nose begins to bleed...")
- H.drip(1)
-
-/mob/living/simple_mob/vox/armalis/verb/shriek()
- set category = "Alien"
- set name = "Shriek"
- set desc = "Give voice to a psychic shriek."
-
-/mob/living/simple_mob/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
- if(istype(O,/obj/item/vox/armalis_armour))
- user.drop_item(O, src)
- armour = O
- movement_cooldown = 4
- maxHealth += 200
- health += 200
- visible_message("[src] is quickly outfitted in [O] by [user].","You quickly outfit [src] in [O].")
- update_icon()
- return
- if(istype(O,/obj/item/vox/armalis_amp))
- user.drop_item(O, src)
- amp = O
- visible_message("[src] is quickly outfitted in [O] by [user].","You quickly outfit [src] in [O].")
- update_icon()
- return
- return ..()
-
-/mob/living/simple_mob/vox/armalis/update_icon()
- . = ..()
- if(armour)
- var/icon/armour = image('icons/mob/vox.dmi',"armour")
- movement_cooldown = 4
- add_overlay(armour)
- if(amp)
- var/icon/amp = image('icons/mob/vox.dmi',"amplifier")
- add_overlay(amp)
-
-/obj/item/vox/armalis_armour
- name = "strange armour"
- desc = "Hulking reinforced armour for something huge."
- icon = 'icons/inventory/suit/item.dmi'
- icon_state = "armalis_armour"
- item_state = "armalis_armour"
-
-/obj/item/vox/armalis_amp
- name = "strange lenses"
- desc = "A series of metallic lenses and chains."
- icon = 'icons/inventory/suit/item.dmi'
- icon_state = "amp"
- item_state = "amp"
+/mob/living/simple_mob/vox/armalis
+ name = "serpentine alien"
+ real_name = "serpentine alien"
+ desc = "A one-eyed, serpentine creature, half-machine, easily nine feet from tail to beak!"
+ icon = 'icons/mob/vox.dmi'
+ icon_state = "armalis"
+ icon_living = "armalis"
+ min_oxy = 0
+ max_oxy = 0
+ min_tox = 0
+ max_tox = 0
+ min_co2 = 0
+ max_co2 = 0
+ min_n2 = 0
+ max_n2 = 0
+ minbodytemp = 0
+ maxHealth = 500
+ health = 500
+ taser_kill = 0
+ has_langs = list(LANGUAGE_VOX)
+ ic_revivable = 1
+ has_hands = 1
+ response_harm = "slashes at the"
+ harm_intent_damage = 0
+ melee_damage_lower = 30
+ melee_damage_upper = 40
+ attack_sharp = 1
+ attacktext = "slammed its enormous claws into"
+ movement_cooldown = 2
+// environment_smash_flags = SMASH_LIGHT_STRUCTURES | SMASH_CONTAINERS | SMASH_WALLS // WALLS Temporary commenting, YW - Hv3
+ attack_sound = 'sound/weapons/bladeslice.ogg'
+ status_flags = 0
+ max_oxy = 0
+
+ var/armour = null
+ var/amp = null
+ var/quills = 3
+
+/mob/living/simple_mob/vox/armalis/death(var/gibbed = FALSE)
+ ..(TRUE)
+ var/turf/gloc = get_turf(loc)
+ visible_message("[src] shudders violently and explodes!","You feel your body rupture!")
+ gib()
+ explosion(gloc, -1, -1, 3, 5)
+ qdel(src)
+
+/mob/living/simple_mob/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
+ base_attack_cooldown = 5
+ if(O.force)
+ if(O.force >= 25)
+ var/damage = O.force
+ if (O.damtype == HALLOSS)
+ damage = 0
+ health -= damage
+ for(var/mob/M in viewers(src, null))
+ if ((M.client && !( M.blinded )))
+ M.show_message("[src] has been attacked with the [O] by [user]. ")
+ else
+ for(var/mob/M in viewers(src, null))
+ if ((M.client && !( M.blinded )))
+ M.show_message("The [O] bounces harmlessly off of [src]. ")
+ else
+ to_chat(usr, "This weapon is ineffective, it does no damage.")
+ for(var/mob/M in viewers(src, null))
+ if ((M.client && !( M.blinded )))
+ M.show_message("[user] gently taps [src] with the [O]. ")
+
+/mob/living/simple_mob/vox/armalis/verb/fire_quill(mob/target as mob in oview())
+ set name = "Fire quill"
+ set desc = "Fires a viciously pointed quill at a high speed."
+ set category = "Alien"
+
+ if(quills<=0)
+ return
+
+ to_chat(src, "You launch a razor-sharp quill at [target]!")
+ for(var/mob/O in oviewers())
+ if ((O.client && !( O.blinded )))
+ to_chat(O, "[src] launches a razor-sharp quill at [target]!")
+
+ var/obj/item/arrow/quill/Q = new(loc)
+ Q.fingerprintslast = src.ckey
+ Q.throw_at(target,10,30)
+ quills--
+
+ spawn(100)
+ to_chat(src, "You feel a fresh quill slide into place.")
+ quills++
+
+/mob/living/simple_mob/vox/armalis/verb/message_mob()
+ set category = "Alien"
+ set name = "Commune with creature"
+ set desc = "Send a telepathic message to an unlucky recipient."
+
+ var/list/targets = list()
+ var/target = null
+ var/text = null
+
+ targets += getmobs() //Fill list, prompt user with list
+ for(var/key in targets)
+ var/mob/mobx = targets[key]
+ if(!mobx.ckey)
+ targets -= key
+
+ target = tgui_input_list(src, "Select a creature!", "Speak to creature", targets)
+
+ if(!target) return
+
+ text = tgui_input_text(src, "What would you like to say?", "Speak to creature")
+
+ if (!target || !text)
+ return
+
+ var/mob/M = targets[target]
+
+ if(istype(M, /mob/observer/dead) || M.stat == DEAD)
+ to_chat(src, "Not even the armalis can speak to the dead.")
+ return
+
+ to_chat(M, "Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")
+ if(istype(M,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = M
+ if(H.species.name == SPECIES_VOX)
+ return
+ to_chat(H, "Your nose begins to bleed...")
+ H.drip(1)
+
+/mob/living/simple_mob/vox/armalis/verb/shriek()
+ set category = "Alien"
+ set name = "Shriek"
+ set desc = "Give voice to a psychic shriek."
+
+/mob/living/simple_mob/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
+ if(istype(O,/obj/item/vox/armalis_armour))
+ user.drop_item(O, src)
+ armour = O
+ movement_cooldown = 4
+ maxHealth += 200
+ health += 200
+ visible_message("[src] is quickly outfitted in [O] by [user].","You quickly outfit [src] in [O].")
+ update_icon()
+ return
+ if(istype(O,/obj/item/vox/armalis_amp))
+ user.drop_item(O, src)
+ amp = O
+ visible_message("[src] is quickly outfitted in [O] by [user].","You quickly outfit [src] in [O].")
+ update_icon()
+ return
+ return ..()
+
+/mob/living/simple_mob/vox/armalis/update_icon()
+ . = ..()
+ if(armour)
+ var/icon/armour = image('icons/mob/vox.dmi',"armour")
+ movement_cooldown = 4
+ add_overlay(armour)
+ if(amp)
+ var/icon/amp = image('icons/mob/vox.dmi',"amplifier")
+ add_overlay(amp)
+
+/obj/item/vox/armalis_armour
+ name = "strange armour"
+ desc = "Hulking reinforced armour for something huge."
+ icon = 'icons/inventory/suit/item.dmi'
+ icon_state = "armalis_armour"
+ item_state = "armalis_armour"
+
+/obj/item/vox/armalis_amp
+ name = "strange lenses"
+ desc = "A series of metallic lenses and chains."
+ icon = 'icons/inventory/suit/item.dmi'
+ icon_state = "amp"
+ item_state = "amp"
diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm
index b3f6109d6a..ac6d666a53 100644
--- a/code/modules/nifsoft/nif.dm
+++ b/code/modules/nifsoft/nif.dm
@@ -636,7 +636,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
durability = 1000
// YW Addition: START
-/obj/item/device/nif/authenticbio
+/obj/item/nif/authenticbio
name = "Bioadaptive Authentic NIF"
desc = "The cutting-edge of NIF technology, this is the strongest, most reliable, and most adaptive framework developed to date. Extremely expensive to produce."
durability = 1000
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 1d097f3136..67e88ee1f6 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -235,14 +235,14 @@
var/mob/living/carbon/human/H = M
if(H == user)
if(icon_state == "scrap" && H.check_has_mouth()) //YW Edit Start
- user << "You begin to stuff \the [src] into your mouth!"
+ user << span_warning("You begin to stuff \the [src] into your mouth!")
if(do_after(user, 30))
- user << "You stuff \the [src] into your mouth!"
+ user << span_warning("You stuff \the [src] into your mouth!")
H.ingested.add_reagent("paper", 10)
H.adjustOxyLoss(10)
qdel(src)
- else // YW EDIT End
- to_chat(user, span_notice("You wipe off the lipstick with [src]."))
+ else
+ user << span_notice("You wipe off the lipstick with [src].")
H.lip_style = null
H.update_icons_body()
else
@@ -735,6 +735,6 @@
var/is_copy = 1
// YW Additions Start
-/obj/item/weapon/paper/shieldgen
+/obj/item/paper/shieldgen
name = "Memo:Station Bubble Shield Generator."
info = "Hello Engineers
\n
\nYou might be wondering what happened to the shield generator.
\nWell, Long story short, a bottle of vodka, and one 'enlightened' scientist later,
\n It's particularly non-existing. We don't have time to replace it this shift, so grab a spare from your Secure storage. Good luck! -Interim Construction Specialist Tahls"
diff --git a/code/modules/paperwork/paper_yw.dm b/code/modules/paperwork/paper_yw.dm
index 23084ecc62..24b1542292 100644
--- a/code/modules/paperwork/paper_yw.dm
+++ b/code/modules/paperwork/paper_yw.dm
@@ -1,17 +1,17 @@
-/obj/item/weapon/paper/crumpled/bloody/whiskeystation
+/obj/item/paper/crumpled/bloody/whiskeystation
icon_state = "scrap_bloodied"
info = "By Gods, Jenkins was right. We dug too deep, and now those things escaped the blast doors. I can hear them pounding on the walls. I hope Hephaestus gets our distress signal so-"
-/obj/item/weapon/paper/crumpled/whiskeymine
+/obj/item/paper/crumpled/whiskeymine
name = "Emergency lockdown"
icon_state = "scrap"
info = "For the love of god, I hate it when they lockdown the deep mine in these damn tests. One of these days I'll give bill a piece of my mind. I'm tired of having to walk all the way back to the station just to hit a damn button."
-/obj/item/weapon/paper/crumpled/whiskeyhermit
+/obj/item/paper/crumpled/whiskeyhermit
name = "Hermit's notes"
icon_state = "scrap"
info = "I told them over and over! Stop digging. But no, of course not. They kept digging, and digging and digging on down, and now their dead. now we're all dead."
-/obj/item/weapon/paper/psmartfridge
+/obj/item/paper/psmartfridge
name = "Hastily scribbled smartfridge note"
- info = "For the last time, the only smartfridges that we do not empty when doing clean up is the ones in cargo and in the kitchen freezer stop leaving materials in the temporary ones do we look like cargo personel to you? Love from a concerned member of the cleanup crew"
\ No newline at end of file
+ info = "For the last time, the only smartfridges that we do not empty when doing clean up is the ones in cargo and in the kitchen freezer stop leaving materials in the temporary ones do we look like cargo personel to you? Love from a concerned member of the cleanup crew"
diff --git a/code/modules/persistence/noticeboard_yw.dm b/code/modules/persistence/noticeboard_yw.dm
index 50256d441a..58ef51360e 100644
--- a/code/modules/persistence/noticeboard_yw.dm
+++ b/code/modules/persistence/noticeboard_yw.dm
@@ -7,17 +7,17 @@
icon_state = "nboard02"
/obj/structure/noticeboard/medical/New()
- var/obj/item/weapon/paper/P = new()
+ var/obj/item/paper/P = new()
P.name = "Staff Notice: Patient rooms"
P.info = "
No matter how many times I've said this, it doesn't seem to stick, so I'm leaving this reminder: Screwing patients in the patient rooms is a serious breach of professionality and your code of ethics. Take it to the dorms."
- P.stamped = list(/obj/item/weapon/stamp/cmo)
+ P.stamped = list(/obj/item/stamp/cmo)
P.overlays = list("paper_stamped_cmo")
src.contents += P
-
+
P = new()
P.name = "Staff Notice: Breakroom \& Storage"
P.info = "
Enjoy the view from the new breakroom. You've also got a storage room full of leftover supplies from the shift before yours."
- P.stamped = list(/obj/item/weapon/stamp/cmo)
+ P.stamped = list(/obj/item/stamp/cmo)
P.overlays = list("paper_stamped_cmo")
src.contents += P
@@ -27,10 +27,10 @@
icon_state = "nboard01"
/obj/structure/noticeboard/toxins/New()
- var/obj/item/weapon/paper/P = new()
+ var/obj/item/paper/P = new()
P.name = "Staff Notice: Toxins Mixing"
P.info = "
Toxins Mixing is currently shut down for the time being, due to damage requiring parts from off station to fix. Please do not use at this time, or risk setting the entire outpost on fire."
- P.stamped = list(/obj/item/weapon/stamp/rd)
+ P.stamped = list(/obj/item/stamp/rd)
P.overlays = list("paper_stamped_rd")
src.contents += P
@@ -40,10 +40,10 @@
icon_state = "nboard01"
/obj/structure/noticeboard/nanite/New()
- var/obj/item/weapon/paper/P = new()
+ var/obj/item/paper/P = new()
P.name = "Staff Notice: Nanite Laboratory"
P.info = "
The Nanite Laboratory is nearly complete. We're simply awaiting specialized machinery and equipment from central. The lab is currently shut down. Please do not use at this time."
- P.stamped = list(/obj/item/weapon/stamp/rd)
+ P.stamped = list(/obj/item/stamp/rd)
P.overlays = list("paper_stamped_rd")
src.contents += P
@@ -53,10 +53,10 @@
icon_state = "nboard01"
/obj/structure/noticeboard/blueshield/New()
- var/obj/item/weapon/paper/P = new()
+ var/obj/item/paper/P = new()
P.name = "Staff Notice: Blueshield Special Reserve"
P.info = "
This secure storage unit is intended to be used for special equipment specifically for the use of Blueshield Agents in the event of a Code Red threat to Heads of Staff. Heads of Staff found 'commandeering' this equipment can expect to be severely reprimanded.
(Underneath, there is a messy handwritten addition.)
Sorry, we haven't had time or spare funds to issue anything yet. You know how frontier budgets are! Sit tight, champ. -Z.V."
- P.stamped = list(/obj/item/weapon/stamp/centcomm)
+ P.stamped = list(/obj/item/stamp/centcomm)
P.overlays = list("paper_stamped_cent")
src.contents += P
@@ -65,7 +65,7 @@
icon_state = "nboard02"
/obj/structure/noticeboard/library/New()
- var/obj/item/weapon/paper/P = new()
+ var/obj/item/paper/P = new()
P.name = "Library Warning: coffee stains"
P.info = "
I seem to tell you guys this daily, but please, stop bringing coffee to carpeted areas. It's hard enough to get the stains off wood,let alone carpet."
src.contents += P
@@ -80,24 +80,24 @@
icon_state = "nboard03"
/obj/structure/noticeboard/exploration/New()
- var/obj/item/weapon/paper/P = new()
+ var/obj/item/paper/P = new()
P.name = "Memo: Prototype ship"
P.info = "
With the lost of our last Research installation and the damage sustained to the old exploration shuttle,We've decided to finally approve the construction of the Prototype Star-Runner class Exploration Vessel. Keep in mind it's a prototype, so try not to scratch it's paint. We don't have a second."
- P.stamped = list(/obj/item/weapon/stamp/centcomm)
+ P.stamped = list(/obj/item/stamp/centcomm)
P.overlays = list("paper_stamped_cent")
src.contents += P
P = new()
P.name = "Memo RE: Expedition Requirements"
P.info = "Jones,
For the last time, Expeditions regulations require atleast three crew members, including the Pathfinder and/or Research Director. The next time you activate your bluespace drive with less then that, and you're fired from the department.I won't have this conversation again.
- R.F"
- P.stamped = list(/obj/item/weapon/stamp/rd)
+ P.stamped = list(/obj/item/stamp/rd)
P.overlays = list("paper_stamped_rd")
src.contents += P
P = new()
P.name = "Memo RE: Pilot duties"
P.info = "Pilots, As you're fully aware, we're on the edge of civilized space out here.
Leaving the shuttle area is dangerious. This is why the Prototype is equipped with a proper camera system to keep an eye on the explorers. If you get yourselves killed, and an explorer has to crash land the ship back here, the company is NOT going to be happy.
- R.F"
- P.stamped = list(/obj/item/weapon/stamp/rd)
+ P.stamped = list(/obj/item/stamp/rd)
P.overlays = list("paper_stamped_rd")
src.contents += P
@@ -106,9 +106,9 @@
icon_state = "nboard01"
/obj/structure/noticeboard/airlock/New()
- var/obj/item/weapon/paper/P = new()
+ var/obj/item/paper/P = new()
P.name = "Staff Notice: Airlock Proceedure"
P.info = "
Due to the large amount of new staff unfamiliar with our proceedures we've left you some instructions.
To exit through an airlock, simply hit the button to open the interior, and then cycle to exterior once inside. To re-enter the station, enter the airlock, Close the exterior hatch, and look for the customized thermal regulators installed on the wall.
This should heat up the air in the airlock, allowing you to open the interior door with no issues."
- P.stamped = list(/obj/item/weapon/stamp/captain)
+ P.stamped = list(/obj/item/stamp/captain)
P.overlays = list("paper_stamp-cap")
- src.contents += P
\ No newline at end of file
+ src.contents += P
diff --git a/code/modules/planet/borealismajoris.dm b/code/modules/planet/borealismajoris.dm
index 2099cd7fc8..ac270f49ea 100644
--- a/code/modules/planet/borealismajoris.dm
+++ b/code/modules/planet/borealismajoris.dm
@@ -297,7 +297,7 @@ var/datum/planet/borealis2/planet_borealis2 = null
continue // They're indoors, so no need to rain on them.
// If they have an open umbrella, it'll guard from rain
- var/obj/item/weapon/melee/umbrella/U = L.get_active_hand()
+ var/obj/item/melee/umbrella/U = L.get_active_hand()
if(!istype(U) || !U.open)
U = L.get_inactive_hand()
@@ -351,14 +351,14 @@ var/datum/planet/borealis2/planet_borealis2 = null
// Lazy wind code
if(prob(10))
- if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella))
- var/obj/item/weapon/melee/umbrella/U = L.get_active_hand()
+ if(istype(L.get_active_hand(), /obj/item/melee/umbrella))
+ var/obj/item/melee/umbrella/U = L.get_active_hand()
if(U.open)
to_chat(L, "You struggle to keep hold of your umbrella!")
L.Stun(20) // This is not nearly as long as it seems
playsound(L, 'sound/effects/rustle1.ogg', 100, 1) // Closest sound I've got to "Umbrella in the wind"
- else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella))
- var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand()
+ else if(istype(L.get_inactive_hand(), /obj/item/melee/umbrella))
+ var/obj/item/melee/umbrella/U = L.get_inactive_hand()
if(U.open)
to_chat(L, "A gust of wind yanks the umbrella from your hand!")
playsound(L, 'sound/effects/rustle1.ogg', 100, 1)
@@ -367,7 +367,7 @@ var/datum/planet/borealis2/planet_borealis2 = null
U.throw_at(get_edge_target_turf(U, pick(alldirs)), 8, 1, L)
// If they have an open umbrella, it'll guard from rain
- var/obj/item/weapon/melee/umbrella/U = L.get_active_hand()
+ var/obj/item/melee/umbrella/U = L.get_active_hand()
if(!istype(U) || !U.open)
U = L.get_inactive_hand()
@@ -425,7 +425,7 @@ var/datum/planet/borealis2/planet_borealis2 = null
continue // They're indoors, so no need to pelt them with ice.
// If they have an open umbrella, it'll guard from hail
- var/obj/item/weapon/melee/umbrella/U = H.get_active_hand()
+ var/obj/item/melee/umbrella/U = H.get_active_hand()
if(!istype(U) || !U.open)
U = H.get_inactive_hand()
diff --git a/code/modules/power/cells/device_cells.dm b/code/modules/power/cells/device_cells.dm
index ab06c06b0c..4ed998d086 100644
--- a/code/modules/power/cells/device_cells.dm
+++ b/code/modules/power/cells/device_cells.dm
@@ -88,7 +88,7 @@
charge = 0
update_icon()
-/obj/item/weapon/cell/device/super
+/obj/item/cell/device/super
name = "super device power cell"
desc = "A small upgraded power cell designed to power handheld devices."
icon = 'icons/obj/power_yw.dmi'
@@ -97,12 +97,12 @@
charge_amount = 20
origin_tech = list(TECH_POWER = 3)
-/obj/item/weapon/cell/device/super/empty/Initialize()
+/obj/item/cell/device/super/empty/Initialize()
. = ..()
charge = 0
update_icon()
-/obj/item/weapon/cell/device/hyper
+/obj/item/cell/device/hyper
name = "hyper device power cell"
desc = "A small upgraded power cell designed to hold much more power for handheld devices."
icon = 'icons/obj/power_yw.dmi'
@@ -111,7 +111,7 @@
charge_amount = 20
origin_tech = list(TECH_POWER = 4)
-/obj/item/weapon/cell/device/hyper/empty/Initialize()
+/obj/item/cell/device/hyper/empty/Initialize()
. = ..()
charge = 0
update_icon()
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index f864c76ae3..9df0403a7c 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -333,7 +333,7 @@ var/global/list/light_type_cache = list()
. =..()
if(start_with_cell && !no_emergency)
- cell = new/obj/item/weapon/cell/emergency_light(src)
+ cell = new/obj/item/cell/emergency_light(src)
if(construct)
start_with_cell = FALSE
status = LIGHT_EMPTY
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 590d4724fb..ef8f65b891 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -447,12 +447,12 @@
if(recoil_mode > 0)
if(mysize <= 0.5)
nerd.Weaken(1*recoil_mode)
- if(!istype(src,/obj/item/weapon/gun/energy))
+ if(!istype(src,/obj/item/gun/energy))
nerd.adjustBruteLoss((5-mysize*4)*recoil_mode)
to_chat(nerd, "You're so tiny that you drop the gun and hurt yourself from the recoil!")
else
to_chat(nerd, "You're so tiny that the pull of the trigger causes you to drop the gun!")
-
+
//YAWNEDIT: Knockdown code end
// Similar to the above proc, but does not require a user, which is ideal for things like turrets.
diff --git a/code/modules/projectiles/guns/energy/laser_yw.dm b/code/modules/projectiles/guns/energy/laser_yw.dm
index 7957a0ad89..d1c38cc96d 100644
--- a/code/modules/projectiles/guns/energy/laser_yw.dm
+++ b/code/modules/projectiles/guns/energy/laser_yw.dm
@@ -1,5 +1,5 @@
///START OF GAUSS WEAPONRY -Radiantflash ///
-/obj/item/weapon/gun/energy/soapenergy/gauss
+/obj/item/gun/energy/soapenergy/gauss
name = "gauss pistol"
icon = 'icons/obj/gun_yw.dmi'
icon_state = "gausspistol"
@@ -16,7 +16,7 @@
charge_meter = 1
fire_delay = 10 //old technology
-/obj/item/weapon/gun/energy/soapenergy/gaussrifle
+/obj/item/gun/energy/soapenergy/gaussrifle
name = "gauss rifle"
icon = 'icons/obj/gun_yw.dmi'
icon_state = "gaussrifle"
diff --git a/code/modules/projectiles/guns/energy/netgun_yw.dm b/code/modules/projectiles/guns/energy/netgun_yw.dm
index 8c463b3300..58fe21dae1 100644
--- a/code/modules/projectiles/guns/energy/netgun_yw.dm
+++ b/code/modules/projectiles/guns/energy/netgun_yw.dm
@@ -1,5 +1,5 @@
-/obj/item/weapon/gun/energy/hunter
+/obj/item/gun/energy/hunter
name = "Hybrid 'Hunter' net gun"
desc = "A Hephaestus-designed hybrid of a taser and the energy net gun, usually dubbed 'Hunter' stunner and energy net launcher, \
for when you want criminals to stop acting like they're on a 20th century British comedy sketch show."
@@ -21,7 +21,7 @@
list(mode_name="capture", projectile_type=/obj/item/projectile/beam/energy_net, fire_sound = 'sound/weapons/eluger.ogg', charge_cost=1200, fire_delay=50)
)
-/obj/item/weapon/gun/energy/hunter/update_icon()
+/obj/item/gun/energy/hunter/update_icon()
overlays.Cut()
if(power_supply)
diff --git a/code/modules/projectiles/guns/energy/nuclear_yw.dm b/code/modules/projectiles/guns/energy/nuclear_yw.dm
index 560887fc76..76b1b47956 100644
--- a/code/modules/projectiles/guns/energy/nuclear_yw.dm
+++ b/code/modules/projectiles/guns/energy/nuclear_yw.dm
@@ -1,4 +1,4 @@
-/obj/item/weapon/gun/energy/sf2000
+/obj/item/gun/energy/sf2000
name = "SF 2000"
desc = "A oddly shaped red colored energy gun, can fire both stun and lethal lasers"
icon_state = "lasgunstun"
@@ -17,7 +17,7 @@
)
-/obj/item/weapon/gun/energy/gun/burst/mg42
+/obj/item/gun/energy/gun/burst/mg42
name = "MG42-E"
desc = "Space Blitzkrieg."
icon = 'icons/obj/gun_yw.dmi'
@@ -44,7 +44,7 @@
list(mode_name="15 laser burst, ye boi.", burst=15, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), dispersion=list(0.0, 0.2, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="mg42-e", fire_sound='sound/weapons/Laser.ogg'),
)
-/obj/item/weapon/gun/energy/x01
+/obj/item/gun/energy/x01
name = "X01 energy gun"
desc = "A rare weapon, handcrafted by a ArcLight manufactury on Luna. This one appears customized with older technology for the price a small fortune."
icon_state = "x01stun"
diff --git a/code/modules/projectiles/guns/energy/protector_vr.dm b/code/modules/projectiles/guns/energy/protector_vr.dm
index 177f36c233..cc8a78c28c 100644
--- a/code/modules/projectiles/guns/energy/protector_vr.dm
+++ b/code/modules/projectiles/guns/energy/protector_vr.dm
@@ -1,8 +1,9 @@
// -------------- Protector -------------
/obj/item/gun/energy/gun/protector
name = "secure small energy gun"
- "The WT-98a 'Protector' is a common sidearm developed by Ward-Takahashi GMC. It features a powerful stun mode, and an alert-level-locked lethal mode, only usable when the connected jurisdiction allows. It also features an integrated flashlight!" // YW EDIT
+ desc = "The WT-98a 'Protector' is a common sidearm developed by Ward-Takahashi GMC. It features a powerful stun mode, and an alert-level-locked lethal mode, only usable when the connected jurisdiction allows. It also features an integrated flashlight!" // YW EDIT
catalogue_data = list(/datum/category_item/catalogue/information/organization/ward_takahashi) // YW EDIT
+
description_info = "This gun can only be fired in lethal mode while on higher security alert levels. It is legal for sec to carry for this reason, since it cannot be used for lethal force until SOP allows it, in essence."
description_fluff = "One of the few sidearms developed by Ward-Takahashi, this gun has a wireless connection to the computer's datacore to ensure it can't be used without authorization from heads of staff who have raised the alert level. Until then, *click*!"
description_antag = "The gun can be emagged to remove the lethal security level restriction, allowing it to be fired on lethal mode at all times."
diff --git a/code/modules/projectiles/guns/projectile/automatic_yw.dm b/code/modules/projectiles/guns/projectile/automatic_yw.dm
index 8990461946..29c0a12799 100644
--- a/code/modules/projectiles/guns/projectile/automatic_yw.dm
+++ b/code/modules/projectiles/guns/projectile/automatic_yw.dm
@@ -1,4 +1,4 @@
-/obj/item/weapon/gun/projectile/automatic/mg42
+/obj/item/gun/projectile/automatic/mg42
name = "MG42"
desc = "Entfesseln die Holle" //Unleash the hell
icon = 'icons/obj/gun_yw.dmi'
@@ -32,43 +32,43 @@
var/cover_open = 0
-/obj/item/weapon/gun/projectile/automatic/mg42/special_check(mob/user)
+/obj/item/gun/projectile/automatic/mg42/special_check(mob/user)
if(cover_open)
user << "[src]'s cover is open! Close it before firing!"
return 0
return ..()
-/obj/item/weapon/gun/projectile/automatic/mg42/proc/toggle_cover(mob/user)
+/obj/item/gun/projectile/automatic/mg42/proc/toggle_cover(mob/user)
cover_open = !cover_open
user << "You [cover_open ? "open" : "close"] [src]'s cover."
update_icon()
update_held_icon()
-/obj/item/weapon/gun/projectile/automatic/mg42/attack_self(mob/user as mob)
+/obj/item/gun/projectile/automatic/mg42/attack_self(mob/user as mob)
if(cover_open)
toggle_cover(user) //close the cover
else
return ..() //once closed, behave like normal
-/obj/item/weapon/gun/projectile/automatic/mg42/attack_hand(mob/user as mob)
+/obj/item/gun/projectile/automatic/mg42/attack_hand(mob/user as mob)
if(!cover_open && user.get_inactive_hand() == src)
toggle_cover(user) //open the cover
else
return ..() //once open, behave like normal
-/obj/item/weapon/gun/projectile/automatic/mg42/update_icon()
+/obj/item/gun/projectile/automatic/mg42/update_icon()
icon_state = "mg42[cover_open ? "open" : "closed"][ammo_magazine ? "" : "-empty"][cover_open && ammo_magazine && ammo_magazine.stored_ammo.len == 0 ? "0" : ""]"
item_state = "mg42"
update_held_icon()
-/obj/item/weapon/gun/projectile/automatic/mg42/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/automatic/mg42/load_ammo(var/obj/item/A, mob/user)
if(!cover_open)
user << "You need to open the cover to load [src]."
return
..()
-/obj/item/weapon/gun/projectile/automatic/mg42/unload_ammo(mob/user, var/allow_dump=1)
+/obj/item/gun/projectile/automatic/mg42/unload_ammo(mob/user, var/allow_dump=1)
if(!cover_open)
user << "You need to open the cover to unload [src]."
return
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/projectiles/guns/projectile/pistol_yw.dm b/code/modules/projectiles/guns/projectile/pistol_yw.dm
index 95ecdec80e..822df1c295 100644
--- a/code/modules/projectiles/guns/projectile/pistol_yw.dm
+++ b/code/modules/projectiles/guns/projectile/pistol_yw.dm
@@ -1,5 +1,5 @@
/******GLOCK******/
-/obj/item/weapon/gun/projectile/automatic/glock
+/obj/item/gun/projectile/automatic/glock
name = "Glock G18"
desc = "A automatic handgun that uses .9mm rounds."
icon_state = "glock"
@@ -16,7 +16,7 @@
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
-/obj/item/weapon/gun/projectile/automatic/glock/update_icon()
+/obj/item/gun/projectile/automatic/glock/update_icon()
..()
if(ammo_magazine)
icon_state = "[initial(icon_state)]"
@@ -25,7 +25,7 @@
/*******PPK*******/
-/obj/item/weapon/gun/projectile/ppk
+/obj/item/gun/projectile/ppk
name = "PPK"
desc = "A handgun that uses .9mm rounds."
icon_state = "ppk"
@@ -37,7 +37,7 @@
magazine_type = /obj/item/ammo_magazine/m9mm
allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
-/obj/item/weapon/gun/projectile/ppk/update_icon()
+/obj/item/gun/projectile/ppk/update_icon()
..()
if(ammo_magazine)
icon_state = "[initial(icon_state)]"
@@ -46,7 +46,7 @@
/*******M2024*******/
-/obj/item/weapon/gun/projectile/m2024
+/obj/item/gun/projectile/m2024
name = "Custom M2024"
desc = "Customized model of old yet reliable sol .45 handgun with the name 'M2024'. Used to be popular, still appreciated for it's effectiveness."
icon_state = "m2024"
@@ -58,7 +58,7 @@
magazine_type = /obj/item/ammo_magazine/m2024
allowed_magazines = list(/obj/item/ammo_magazine/m2024,/obj/item/ammo_magazine/m45)
-/obj/item/weapon/gun/projectile/m2024/update_icon()
+/obj/item/gun/projectile/m2024/update_icon()
..()
if(ammo_magazine)
icon_state = "[initial(icon_state)]"
@@ -66,7 +66,7 @@
icon_state = "[initial(icon_state)]-empty"
/*******M1911 Custom fluff*******/
-/obj/item/weapon/gun/projectile/fluff/m1911
+/obj/item/gun/projectile/fluff/m1911
name = "M1911 Custom"
desc = "A modernized, customized M1911 pistol with a rail for attachments such as flashlight or laser sight (fooken laser sights). It's engraved, and the engraving says, 'For honorable duty.' It's original, Sol Gov firearm from Earth, not a cheap mars replica."
icon_state = "m1911"
@@ -78,9 +78,9 @@
magazine_type = /obj/item/ammo_magazine/m45
allowed_magazines = list(/obj/item/ammo_magazine/m45)
-/obj/item/weapon/gun/projectile/m2024/update_icon()
+/obj/item/gun/projectile/m2024/update_icon()
..()
if(ammo_magazine)
icon_state = "[initial(icon_state)]"
else
- icon_state = "[initial(icon_state)]-empty"
\ No newline at end of file
+ icon_state = "[initial(icon_state)]-empty"
diff --git a/code/modules/projectiles/guns/projectile/revolver_yw.dm b/code/modules/projectiles/guns/projectile/revolver_yw.dm
index 864efcb6de..19ae111159 100644
--- a/code/modules/projectiles/guns/projectile/revolver_yw.dm
+++ b/code/modules/projectiles/guns/projectile/revolver_yw.dm
@@ -1,13 +1,13 @@
-/obj/item/weapon/gun/projectile/revolver/nova
+/obj/item/gun/projectile/revolver/nova
name = "Nova"
desc = "Heavily modified revolver, with alas only 6 round chamber but fiery firepower of 357 calibre. Make it count. Uses .357 rounds." // Yes I'm serious. -Spades
icon_state = "nova"
icon = 'icons/obj/gun_yw.dmi'
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
-/obj/item/weapon/gun/projectile/revolver/cerberus
+/obj/item/gun/projectile/revolver/cerberus
name = "Cerberus"
desc = "A high-power, fancy looking revolver that can stop nearly everything it's pointed at. Comes with a standard six-round-cylinder. There is ,Hesphiastos Industries, stamped along it's cylinder." // Yes I'm serious. -Spades
icon_state = "cerb"
icon = 'icons/obj/gun_yw.dmi'
- origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
\ No newline at end of file
+ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
diff --git a/code/modules/projectiles/guns/projectile/shotgun_yw.dm b/code/modules/projectiles/guns/projectile/shotgun_yw.dm
index 62bbc8f2cf..2adb75464c 100644
--- a/code/modules/projectiles/guns/projectile/shotgun_yw.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun_yw.dm
@@ -1,4 +1,4 @@
-/obj/item/weapon/gun/projectile/revolvershotgun
+/obj/item/gun/projectile/revolvershotgun
name = "Jackhammer"
desc = "Uses 12g rounds."
icon = 'icons/obj/gun_yw.dmi'
@@ -15,7 +15,7 @@
allowed_magazines = list(/obj/item/ammo_magazine/m12gdrumjack)
projectile_type = /obj/item/projectile/bullet/shotgun
-/obj/item/weapon/gun/projectile/revolvershotgun/update_icon()
+/obj/item/gun/projectile/revolvershotgun/update_icon()
..()
if(ammo_magazine)
icon_state = "revolvshot"
@@ -77,7 +77,7 @@
fire_sound = 'sound/weapons/Gunshot_shotgun.ogg'
damage = 13
-/obj/item/weapon/storage/box/scattershot
+/obj/item/storage/box/scattershot
name = "box of shotgun scatter shells"
desc = "It has a picture of a shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death. High spread factor, just shoot and pray."
icon = 'icons/obj/ammo_yw.dmi'
@@ -85,5 +85,5 @@
item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
starts_with = list(/obj/item/ammo_casing/a12g/scatter = 8)
-/obj/item/weapon/storage/box/scattershot/large
- starts_with = list(/obj/item/ammo_casing/a12g/scatter = 16)
\ No newline at end of file
+/obj/item/storage/box/scattershot/large
+ starts_with = list(/obj/item/ammo_casing/a12g/scatter = 16)
diff --git a/code/modules/reagents/kelshark.dm b/code/modules/reagents/kelshark.dm
index 51239d37dd..79f93b59a4 100644
--- a/code/modules/reagents/kelshark.dm
+++ b/code/modules/reagents/kelshark.dm
@@ -54,23 +54,23 @@
M.Confuse(drug_strength * 14)
-/obj/item/weapon/reagent_containers/pill/benzilate
+/obj/item/reagent_containers/pill/benzilate
name = "Benzilate pill"
desc = "You probably shouldn't swallow this."
icon_state = "pill2"
-/obj/item/weapon/reagent_containers/pill/benzilate/Initialize()
+/obj/item/reagent_containers/pill/benzilate/Initialize()
. = ..()
reagents.add_reagent("benzilate", 50)
color = reagents.get_color()
-/obj/item/weapon/reagent_containers/pill/phenethylamine
+/obj/item/reagent_containers/pill/phenethylamine
name = "Phenethylamine pill"
desc = "Smells like... lilacs?"
icon_state = "pill5"
-/obj/item/weapon/reagent_containers/pill/phenethylamine/Initialize()
+/obj/item/reagent_containers/pill/phenethylamine/Initialize()
. = ..()
reagents.add_reagent("phenethylamine", 50)
color = reagents.get_color()
@@ -78,30 +78,30 @@
// PILLS THAT WE PROBABLY SHOULDN'T HAVE AAAAAAAAAA. The below is only so they can be included through mapping or "spawn " command. -Carl
-/obj/item/weapon/storage/pill_bottle/benzilate
+/obj/item/storage/pill_bottle/benzilate
name = "bottle of Benzilate pills"
desc = "This just hurts to look at with how many words of caution are scrawled on the lable. Better eat all of 'em!"
-/obj/item/weapon/storage/pill_bottle/benzilate/New()
+/obj/item/storage/pill_bottle/benzilate/New()
..()
- new /obj/item/weapon/reagent_containers/pill/benzilate( src )
- new /obj/item/weapon/reagent_containers/pill/benzilate( src )
- new /obj/item/weapon/reagent_containers/pill/benzilate( src )
- new /obj/item/weapon/reagent_containers/pill/benzilate( src )
- new /obj/item/weapon/reagent_containers/pill/benzilate( src )
- new /obj/item/weapon/reagent_containers/pill/benzilate( src )
- new /obj/item/weapon/reagent_containers/pill/benzilate( src )
+ new /obj/item/reagent_containers/pill/benzilate( src )
+ new /obj/item/reagent_containers/pill/benzilate( src )
+ new /obj/item/reagent_containers/pill/benzilate( src )
+ new /obj/item/reagent_containers/pill/benzilate( src )
+ new /obj/item/reagent_containers/pill/benzilate( src )
+ new /obj/item/reagent_containers/pill/benzilate( src )
+ new /obj/item/reagent_containers/pill/benzilate( src )
-/obj/item/weapon/storage/pill_bottle/phenethylamine
+/obj/item/storage/pill_bottle/phenethylamine
name = "bottle of Phenethylamine pills"
desc = "Looks like someone drew a happy face on the label, replacing whatever was previously present."
-/obj/item/weapon/storage/pill_bottle/phenethylamine/New()
+/obj/item/storage/pill_bottle/phenethylamine/New()
..()
- new /obj/item/weapon/reagent_containers/pill/phenethylamine( src )
- new /obj/item/weapon/reagent_containers/pill/phenethylamine( src )
- new /obj/item/weapon/reagent_containers/pill/phenethylamine( src )
- new /obj/item/weapon/reagent_containers/pill/phenethylamine( src )
- new /obj/item/weapon/reagent_containers/pill/phenethylamine( src )
- new /obj/item/weapon/reagent_containers/pill/phenethylamine( src )
- new /obj/item/weapon/reagent_containers/pill/phenethylamine( src )
+ new /obj/item/reagent_containers/pill/phenethylamine( src )
+ new /obj/item/reagent_containers/pill/phenethylamine( src )
+ new /obj/item/reagent_containers/pill/phenethylamine( src )
+ new /obj/item/reagent_containers/pill/phenethylamine( src )
+ new /obj/item/reagent_containers/pill/phenethylamine( src )
+ new /obj/item/reagent_containers/pill/phenethylamine( src )
+ new /obj/item/reagent_containers/pill/phenethylamine( src )
diff --git a/code/modules/reagents/reagent_containers/bluespacecoffee_yw.dm b/code/modules/reagents/reagent_containers/bluespacecoffee_yw.dm
index 4ef9555714..0fdea73e5f 100644
--- a/code/modules/reagents/reagent_containers/bluespacecoffee_yw.dm
+++ b/code/modules/reagents/reagent_containers/bluespacecoffee_yw.dm
@@ -1,15 +1,15 @@
-/obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee
+/obj/item/reagent_containers/food/drinks/bluespace_coffee
name = "bluespace coffee"
desc = "Dreamt up in a strange feverish dream, this coffee cup seems to have been heavily modified with a variety of unlikely parts and wires, and never seems to run out of coffee. Truly the differance between madmen and genius is success."
icon = 'icons/obj/coffee.dmi'
icon_state = "bluespace_coffee"
center_of_mass = list("x"=15, "y"=10)
volume = 50
-/obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee/Initialize()
+/obj/item/reagent_containers/food/drinks/bluespace_coffee/Initialize()
..()
reagents.add_reagent("coffee", 50)
//Infinite Coffee
-/obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee/attack(mob/M as mob, mob/user as mob, def_zone)
+/obj/item/reagent_containers/food/drinks/bluespace_coffee/attack(mob/M as mob, mob/user as mob, def_zone)
..()
- src.reagents.add_reagent("coffee", 50)
\ No newline at end of file
+ src.reagents.add_reagent("coffee", 50)
diff --git a/code/modules/research/designs/circuits/circuits_yw.dm b/code/modules/research/designs/circuits/circuits_yw.dm
index 4d1756d24f..7adab994d8 100644
--- a/code/modules/research/designs/circuits/circuits_yw.dm
+++ b/code/modules/research/designs/circuits/circuits_yw.dm
@@ -2,12 +2,12 @@
name = "teleporter hub"
id = "teleporter_hub"
req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 2)
- build_path = /obj/item/weapon/circuitboard/teleporter_hub
+ build_path = /obj/item/circuitboard/teleporter_hub
sort_string = "HAAAA"
/datum/design/circuit/teleporter_station
name = "teleporter station"
id = "teleporter_station"
req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 2)
- build_path = /obj/item/weapon/circuitboard/teleporter_station
- sort_string = "HAAAA"
\ No newline at end of file
+ build_path = /obj/item/circuitboard/teleporter_station
+ sort_string = "HAAAA"
diff --git a/code/modules/research/designs/engineering.dm b/code/modules/research/designs/engineering.dm
index 2259a06c2a..0e174d1978 100644
--- a/code/modules/research/designs/engineering.dm
+++ b/code/modules/research/designs/engineering.dm
@@ -37,7 +37,7 @@
id = "RMS"
req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_BLUESPACE = 3)
materials = list(MAT_STEEL = 500, MAT_GLASS = 500, MAT_GOLD = 300, MAT_PHORON = 300, MAT_DIAMOND = 500) //Probably change the price in the future just put something for now
- build_path = /obj/item/weapon/rms
+ build_path = /obj/item/rms
sort_string = "NAAAB"
// YW addition end
diff --git a/code/modules/research/designs/medical.dm b/code/modules/research/designs/medical.dm
index 70bd8dfc71..b2d7492bde 100644
--- a/code/modules/research/designs/medical.dm
+++ b/code/modules/research/designs/medical.dm
@@ -95,7 +95,7 @@
id = "phasic_analyzer"
req_tech = list(TECH_MAGNET = 7, TECH_BIO = 8, TECH_BLUESPACE = 6, TECH_PHORON = 5)
materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_GOLD = 1500, MAT_GOLD = 2000, MAT_URANIUM = 1250, MAT_DIAMOND = 750, MAT_PHORON = 500, MAT_PLASTIC = 1000, MAT_OSMIUM = 500)
- build_path = /obj/item/device/healthanalyzer/phasic
+ build_path = /obj/item/healthanalyzer/phasic
sort_string = "KBAAD"
/datum/design/item/medical/large_bodybag
diff --git a/code/modules/research/designs/power_cells.dm b/code/modules/research/designs/power_cells.dm
index eba5107cd7..760744bea4 100644
--- a/code/modules/research/designs/power_cells.dm
+++ b/code/modules/research/designs/power_cells.dm
@@ -75,7 +75,7 @@
id = "super_device"
req_tech = list(TECH_POWER = 3, TECH_MATERIAL = 2)
materials = list(MAT_STEEL = 700, MAT_GLASS = 70, MAT_GOLD = 50, MAT_GOLD = 20,)
- build_path = /obj/item/weapon/cell/device/super
+ build_path = /obj/item/cell/device/super
category = list("Misc")
sort_string = "BAABC"
@@ -84,7 +84,7 @@
id = "hyper_device"
req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4)
materials = list(MAT_STEEL = 1400, MAT_GLASS = 1400, MAT_GOLD = 150, MAT_GOLD = 150)
- build_path = /obj/item/weapon/cell/device/hyper
+ build_path = /obj/item/cell/device/hyper
category = list("Misc")
sort_string = "BAABD"
@@ -94,7 +94,7 @@
build_type = PROTOLATHE
id = "omni-device"
materials = list(MAT_STEEL = 1700, MAT_GLASS = 550, MAT_DURASTEEL = 230, MAT_MORPHIUM = 320, MAT_METALHYDROGEN = 600, MAT_URANIUM = 60, MAT_VERDANTIUM = 150, MAT_PHORON = 900)
- build_path = /obj/item/weapon/cell/device/weapon/recharge/alien/omni
+ build_path = /obj/item/cell/device/weapon/recharge/alien/omni
category = list("Misc")
sort_string = "BAABE"
//End of Yawn add
diff --git a/code/modules/research/designs/weapons_yw.dm b/code/modules/research/designs/weapons_yw.dm
index aa3a182fc8..5576d38d82 100644
--- a/code/modules/research/designs/weapons_yw.dm
+++ b/code/modules/research/designs/weapons_yw.dm
@@ -3,5 +3,5 @@
id = "huntergun"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 6, TECH_MAGNET = 4)
materials = list(MAT_STEEL = 6000, MAT_GLASS = 3000, MAT_GOLD = 1000)
- build_path = /obj/item/weapon/gun/energy/hunter
+ build_path = /obj/item/gun/energy/hunter
sort_string = "MAAVC"
diff --git a/code/modules/vore/fluffstuff/MadokaSpear.dm b/code/modules/vore/fluffstuff/MadokaSpear.dm
index ce5f5a552c..e9fb082316 100644
--- a/code/modules/vore/fluffstuff/MadokaSpear.dm
+++ b/code/modules/vore/fluffstuff/MadokaSpear.dm
@@ -16,30 +16,30 @@
/*
* Twohanded
*/
-/obj/item/weapon/oldtwohanded
+/obj/item/oldtwohanded
var/wielded = 0
var/force_wielded = 0
var/wieldsound = null
var/unwieldsound = null
var/base_icon
-/obj/item/weapon/oldtwohanded/proc/unwield()
+/obj/item/oldtwohanded/proc/unwield()
wielded = 0
force = initial(force)
name = "[initial(name)]"
update_icon()
-/obj/item/weapon/oldtwohanded/proc/wield()
+/obj/item/oldtwohanded/proc/wield()
wielded = 1
force = force_wielded
name = "[initial(name)] (Wielded)"
update_icon()
-/obj/item/weapon/oldtwohanded/New()
+/obj/item/oldtwohanded/New()
..()
update_icon()
-/obj/item/weapon/oldtwohanded/mob_can_equip(M as mob, slot, disable_warning = FALSE)
+/obj/item/oldtwohanded/mob_can_equip(M as mob, slot, disable_warning = FALSE)
//Cannot equip wielded items.
if(wielded)
to_chat(M, "Unwield the [initial(name)] first!")
@@ -47,22 +47,22 @@
return ..()
-/obj/item/weapon/oldtwohanded/dropped(mob/user as mob)
+/obj/item/oldtwohanded/dropped(mob/user as mob)
//handles unwielding a twohanded weapon when dropped as well as clearing up the offhand
if(user)
- var/obj/item/weapon/oldtwohanded/O = user.get_inactive_hand()
+ var/obj/item/oldtwohanded/O = user.get_inactive_hand()
if(istype(O))
O.unwield()
return unwield()
-/obj/item/weapon/oldtwohanded/update_icon()
+/obj/item/oldtwohanded/update_icon()
icon_state = "[base_icon][wielded]"
item_state = icon_state
-/obj/item/weapon/oldtwohanded/pickup(mob/user)
+/obj/item/oldtwohanded/pickup(mob/user)
unwield()
-/obj/item/weapon/oldtwohanded/attack_self(mob/user as mob)
+/obj/item/oldtwohanded/attack_self(mob/user as mob)
..()
if(wielded) //Trying to unwield it
@@ -71,7 +71,7 @@
if (src.unwieldsound)
playsound(src.loc, unwieldsound, 50, 1)
- var/obj/item/weapon/oldtwohanded/offhand/O = user.get_inactive_hand()
+ var/obj/item/oldtwohanded/offhand/O = user.get_inactive_hand()
if(O && istype(O))
O.unwield()
@@ -84,7 +84,7 @@
if (src.wieldsound)
playsound(src.loc, wieldsound, 50, 1)
- var/obj/item/weapon/oldtwohanded/offhand/O = new(user) ////Let's reserve his other hand~
+ var/obj/item/oldtwohanded/offhand/O = new(user) ////Let's reserve his other hand~
O.name = "[initial(name)] - offhand"
O.desc = "Your second grip on the [initial(name)]"
user.put_in_inactive_hand(O)
@@ -97,22 +97,22 @@
return
///////////OFFHAND///////////////
-/obj/item/weapon/oldtwohanded/offhand
+/obj/item/oldtwohanded/offhand
w_class = 5.0
icon_state = "offhand"
name = "offhand"
-/obj/item/weapon/oldtwohanded/offhand/unwield()
+/obj/item/oldtwohanded/offhand/unwield()
qdel(src)
-/obj/item/weapon/oldtwohanded/offhand/wield()
+/obj/item/oldtwohanded/offhand/wield()
qdel(src)
-/obj/item/weapon/oldtwohanded/offhand/update_icon()
+/obj/item/oldtwohanded/offhand/update_icon()
return
//spears, bay edition
-/obj/item/weapon/oldtwohanded/spear
+/obj/item/oldtwohanded/spear
icon_state = "spearglass0"
base_icon = "spearglass"
name = "spear"
@@ -126,4 +126,4 @@
edge = 0
sharp = 1
hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
\ No newline at end of file
+ attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
diff --git a/code/modules/vore/fluffstuff/axisrus_yw.dm b/code/modules/vore/fluffstuff/axisrus_yw.dm
index da585613ae..c14d3031c5 100644
--- a/code/modules/vore/fluffstuff/axisrus_yw.dm
+++ b/code/modules/vore/fluffstuff/axisrus_yw.dm
@@ -53,13 +53,13 @@
icon_override = 'icons/vore/axisrus_yw.dmi'
item_state = "soldiersuit_mob"
blood_overlay_type = "coat"
- allowed = list(/obj/item/weapon/gun/energy,
- /obj/item/weapon/reagent_containers/spray/pepper,
- /obj/item/weapon/gun/projectile,
+ allowed = list(/obj/item/gun/energy,
+ /obj/item/reagent_containers/spray/pepper,
+ /obj/item/gun/projectile,
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
- /obj/item/weapon/melee/baton,
- /obj/item/weapon/handcuffs)
+ /obj/item/melee/baton,
+ /obj/item/handcuffs)
/obj/item/clothing/suit/storage/labcoat/fluff/zeke_vincir_3/axis/officer
name = "Officer's Waffenrock"
diff --git a/code/modules/vore/fluffstuff/custom_boxes_yw.dm b/code/modules/vore/fluffstuff/custom_boxes_yw.dm
index 91d96391cd..343cf5298f 100644
--- a/code/modules/vore/fluffstuff/custom_boxes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_boxes_yw.dm
@@ -6,24 +6,24 @@
//Amara Faell
-/obj/item/weapon/storage/box/fluff/amara
+/obj/item/storage/box/fluff/amara
name = "Amara's Kit"
desc = "A kit containing Amara's equipment."
has_items = list(
/obj/item/clothing/suit/storage/fluff/fedcoat/amara_jacket,
/obj/item/clothing/head/beret/amara_beret,
/obj/item/clothing/gloves/fluff/amara_gloves,
- /obj/item/weapon/flame/lighter/zippo/fluff/amara,
+ /obj/item/flame/lighter/zippo/fluff/amara,
/obj/item/clothing/under/fluff/amara_uniform,
/obj/item/clothing/shoes/boots/jackboots/fluff/amara_boots,
/obj/item/clothing/accessory/collar/fluff/amara_collar,
- /obj/item/weapon/storage/belt/security/tactical/amara_belt,
- /obj/item/device/modkit_conversion/fluff/amara_hos_kit)
+ /obj/item/storage/belt/security/tactical/amara_belt,
+ /obj/item/modkit_conversion/fluff/amara_hos_kit)
//Zara Venlee
-/obj/item/weapon/storage/box/fluff/zara
+/obj/item/storage/box/fluff/zara
name = "Zara's Kit"
desc = "A kit containing Zara's equipment."
has_items = list(
@@ -35,7 +35,7 @@
//Samantha Quzix
-/obj/item/weapon/storage/box/fluff/samantha
+/obj/item/storage/box/fluff/samantha
name = "Samantha's Kit"
desc = "A kit containing Samantha's equipment."
has_items = list(
@@ -43,22 +43,22 @@
/obj/item/clothing/gloves/sterile/latex/fluff/sam_gloves,
/obj/item/clothing/shoes/boots/jackboots/fluff/sam_boots,
/obj/item/clothing/suit/storage/fluff/fedcoat/sam_jacket,
- /obj/item/weapon/storage/belt/utility/fluff/sam_belt)
+ /obj/item/storage/belt/utility/fluff/sam_belt)
//Nika Domashev / Defunct
-/obj/item/weapon/storage/box/fluff/nika
+/obj/item/storage/box/fluff/nika
name = "Nika's Kit"
desc = "A kit containing Nika's equipment."
has_items = list(
/obj/item/clothing/under/rank/security/corp/fluff/nika,
- /obj/item/device/modkit_conversion/fluff/nika_sec_kit)
+ /obj/item/modkit_conversion/fluff/nika_sec_kit)
//***************
//blackangelsace
//***************
-/obj/item/weapon/storage/box/fluff/madoka
+/obj/item/storage/box/fluff/madoka
name = "Madoka's Case"
desc = "A case containing Madoka's equipment."
has_items = list(
@@ -66,9 +66,9 @@
/obj/item/clothing/suit/armor/fluff/madoka_chest,
/obj/item/clothing/gloves/arm_guard/fluff/madoka_arms,
/obj/item/clothing/shoes/leg_guard/fluff/madoka_legs,
- /obj/item/weapon/oldtwohanded/spear/fluff/madoka_koto_1)
+ /obj/item/oldtwohanded/spear/fluff/madoka_koto_1)
-/obj/item/weapon/storage/box/fluff/kelplague
+/obj/item/storage/box/fluff/kelplague
name = "Fancy Plague Doctor Kit"
desc = "Fancy boye stuff."
has_items = list(
@@ -84,7 +84,7 @@
//JohnWolf135 / Defunct
// **********
-/obj/item/weapon/storage/box/fluff/John
+/obj/item/storage/box/fluff/John
name = "John's kit"
desc = "A kit containing John's equipment."
has_items = list(
@@ -94,7 +94,7 @@
// Mauser items
// ************
-/obj/item/weapon/storage/box/fluff/mauser
+/obj/item/storage/box/fluff/mauser
name = "Mauser's Kit"
desc = "A kit containing Mauser's equipment."
has_items = list(
@@ -108,7 +108,7 @@
//Ally Faell
-/obj/item/weapon/storage/box/fluff/ally
+/obj/item/storage/box/fluff/ally
name = "Ally's Kit"
desc = "A kit containing Ally's equipment."
has_items = list(
@@ -117,16 +117,16 @@
//Raja Bastet
-/obj/item/weapon/storage/box/fluff/raja
+/obj/item/storage/box/fluff/raja
name = "Raja's Kit"
desc = "A kit containing Raja's equipment."
has_items = list(
- /obj/item/weapon/storage/belt/utility/fluff/raja_belt,
+ /obj/item/storage/belt/utility/fluff/raja_belt,
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/raja_coat)
//Shel Nargol
-/obj/item/weapon/storage/box/fluff/shel
+/obj/item/storage/box/fluff/shel
name = "Shel's Kit"
desc = "A kit containing Shel's equipment."
has_items = list(
@@ -135,7 +135,7 @@
//Alva Karlholm
-/obj/item/weapon/storage/box/fluff/alva
+/obj/item/storage/box/fluff/alva
name = "Alva's Kit"
desc = "A kit containing Alva's equipment."
has_items = list(
@@ -149,7 +149,7 @@
//Tikorak Korgask
-/obj/item/weapon/storage/box/fluff/tikorak
+/obj/item/storage/box/fluff/tikorak
name = "Tikorak's Kit"
desc = "A kit containing Tikorak's equipment."
has_items = list(
@@ -160,23 +160,23 @@
// Dawidoe
// *******
-/obj/item/weapon/storage/box/fluff/melissa
+/obj/item/storage/box/fluff/melissa
name = "Melissa's kit"
desc = "A kit containing Melissa's equipment."
has_items = list(
- /obj/item/weapon/flame/lighter/zippo/fluff/melissa,
+ /obj/item/flame/lighter/zippo/fluff/melissa,
/obj/item/clothing/under/rank/security/corp/fluff/melissa_uniform,
- /obj/item/device/modkit_conversion/fluff/melissa_gun_kit)
+ /obj/item/modkit_conversion/fluff/melissa_gun_kit)
// *******
// Dwaggy90
// *******
-/obj/item/weapon/storage/box/fluff/saur
+/obj/item/storage/box/fluff/saur
name = "Saur's kit"
desc = "A kit containing Saur's equipment."
has_items = list(
- /obj/item/weapon/rig/medical/equipped/fluff/saur,
- /obj/item/weapon/storage/backpack/dufflebag/fluff/saur_dufflebag,
+ /obj/item/rig/medical/equipped/fluff/saur,
+ /obj/item/storage/backpack/dufflebag/fluff/saur_dufflebag,
/obj/item/clothing/suit/armor/pcarrier/navy/fluff/saur_pccarrier
)
/*
@@ -186,15 +186,15 @@
//Anoki Windroar
-/obj/item/weapon/storage/box/fluff/anoki
+/obj/item/storage/box/fluff/anoki
name = "Anoki's kit"
desc = "A kit containing Anoki's equipment."
has_items = list(
- /obj/item/weapon/implanter/reagent_generator/roiz/anoki)
+ /obj/item/implanter/reagent_generator/roiz/anoki)
*/
//Ivy Kaeire
-/obj/item/weapon/storage/box/fluff/ivy
+/obj/item/storage/box/fluff/ivy
name = "Ivy's Kit"
desc = "A kit containing Ivy's equipment."
has_items = list(
@@ -207,7 +207,7 @@
//Vanesa FancyFin
-/obj/item/weapon/storage/box/fluff/vanesaf
+/obj/item/storage/box/fluff/vanesaf
name = "Vanesa's kit"
desc = "A kit containing Vanesa's equipment."
has_items = list(
@@ -219,12 +219,12 @@
//Jessica Mayer
-/obj/item/weapon/storage/box/fluff/jessica
+/obj/item/storage/box/fluff/jessica
name = "Jessica's Kit"
desc = "A kit containing Jessica's equipment."
has_items = list(
/obj/item/clothing/under/rank/security/corp/fluff/jessica,
- /obj/item/device/modkit_conversion/fluff/jessica_sec_kit)
+ /obj/item/modkit_conversion/fluff/jessica_sec_kit)
// *******
//LukeVale
@@ -232,23 +232,23 @@
//Mira Rezus
-/obj/item/weapon/storage/box/fluff/mira
+/obj/item/storage/box/fluff/mira
name = "Mira's kit"
desc = "A kit containing Mira's equipment."
has_items = list(
- /obj/item/weapon/implanter/reagent_generator/mira)
+ /obj/item/implanter/reagent_generator/mira)
//Natalya Vospit / Defunct
-/obj/item/weapon/storage/box/fluff/natalya
+/obj/item/storage/box/fluff/natalya
name = "Natalya's kit"
desc = "A kit containing Natalya's equipment."
has_items = list(
- /obj/item/weapon/implanter/reagent_generator/natalya)
+ /obj/item/implanter/reagent_generator/natalya)
//Lena Shaw
-/obj/item/weapon/storage/box/fluff/lena
+/obj/item/storage/box/fluff/lena
name = "Lena's kit"
desc = "A kit containing Lena's equipment."
has_items = list(
@@ -256,15 +256,15 @@
//Eryn Wolfe / Defunct
-/obj/item/weapon/storage/box/fluff/eryn
+/obj/item/storage/box/fluff/eryn
name = "Eryn's kit"
desc = "A kit containing Eryn's equipment."
has_items = list(
- /obj/item/weapon/fluff/chemset)
+ /obj/item/fluff/chemset)
//Mitsuko Jiao
-/obj/item/weapon/storage/box/fluff/jiao
+/obj/item/storage/box/fluff/jiao
name = "Mitsuko's kit"
desc = "A kit containing Mituko's equipment"
has_items = list(
@@ -273,11 +273,11 @@
/obj/item/clothing/under/rank/medical/fluff/jiao_uniform,
/obj/item/clothing/head/beret/fluff/jiao_beret,
/obj/item/clothing/shoes/boots/jackboots/fluff/jiao_boots,
- /obj/item/weapon/storage/belt/medical/fluff/jiao_belt,
+ /obj/item/storage/belt/medical/fluff/jiao_belt,
/obj/item/clothing/gloves/sterile/fluff/jiao_gloves,
- /obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/a,
- /obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/b,
- /obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/c)
+ /obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/a,
+ /obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/b,
+ /obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/c)
// ************
// RadiantFlash
@@ -285,7 +285,7 @@
//Vasharr Zahirn
-/obj/item/weapon/storage/box/fluff/vasharr
+/obj/item/storage/box/fluff/vasharr
name = "Vasharr's Kit"
desc = "A kit containing Vasharr's equipment."
has_items = list(
@@ -296,15 +296,15 @@
//FrenziedVorcha / Defcunt
-/obj/item/weapon/storage/box/fluff/philipsmirnov
+/obj/item/storage/box/fluff/philipsmirnov
name = "Psychiatric box"
desc = "A kit containing various psychiatry tools"
has_items = list(
- /obj/item/weapon/fluff/fidgetspinner,
- /obj/item/weapon/fluff/fidgetspinner/red,
- /obj/item/weapon/fluff/fidgetspinner/yellow,
- /obj/item/weapon/fluff/squeezetoy,
- /obj/item/weapon/fluff/dimensioncube)
+ /obj/item/fluff/fidgetspinner,
+ /obj/item/fluff/fidgetspinner/red,
+ /obj/item/fluff/fidgetspinner/yellow,
+ /obj/item/fluff/squeezetoy,
+ /obj/item/fluff/dimensioncube)
// ******
// Dushka
@@ -312,7 +312,7 @@
//Saroth
-/obj/item/weapon/storage/box/fluff/saroth
+/obj/item/storage/box/fluff/saroth
name = "Saroth's box"
desc = "A kit containing Saroth's equipment."
has_items = list(
@@ -324,7 +324,7 @@
//M.I.S.S.Y
-/obj/item/weapon/storage/box/fluff/missy
+/obj/item/storage/box/fluff/missy
name = "M.I.S.S.Y's box"
desc = "A kit containing M.I.S.S.Y's equipment."
has_items = list(
@@ -332,7 +332,7 @@
//Quanah Hastings
-/obj/item/weapon/storage/box/fluff/quanah
+/obj/item/storage/box/fluff/quanah
name = "Quanah's kit"
desc = "A kit containing Quanah's equipment."
has_items = list(
@@ -344,7 +344,7 @@
//Maxie Drake
-/obj/item/weapon/storage/box/fluff/maxie
+/obj/item/storage/box/fluff/maxie
name = "Maxie's box"
desc = "a kit containing Maxie's equipment."
has_items = list(
@@ -356,7 +356,7 @@
//Noel Walsh
-/obj/item/weapon/storage/box/fluff/noel
+/obj/item/storage/box/fluff/noel
name = "Noel's box"
desc = "a kit containing Maxie's equipment."
has_items = list (
@@ -370,21 +370,21 @@
// ********
//Joseph Skinner
-/obj/item/weapon/storage/box/fluff/skinner
+/obj/item/storage/box/fluff/skinner
name = "Joseph's box"
desc = "a kit containing Joseph's equipment."
has_items = list (
/obj/item/clothing/mask/gas/fluff/skinner,
- /obj/item/device/modkit_conversion/fluff/skinner/a,
- /obj/item/device/modkit_conversion/fluff/skinner/b,
- /obj/item/device/modkit_conversion/fluff/skinner/c)
+ /obj/item/modkit_conversion/fluff/skinner/a,
+ /obj/item/modkit_conversion/fluff/skinner/b,
+ /obj/item/modkit_conversion/fluff/skinner/c)
// ********
// MASMC
// ********
// Kettek Ollarch
-/obj/item/weapon/storage/box/fluff/kettek
+/obj/item/storage/box/fluff/kettek
name = "Kettek's box"
desc = "a kit containing Kettek's equipment."
has_items = list (
diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
index cc2beb3934..b8e1206dbf 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
@@ -349,7 +349,7 @@
icon_badge = "mercvest_badge"
icon_nobadge = "mercvest_nobadge"
-/obj/item/weapon/storage/belt/security/tactical/amara_belt
+/obj/item/storage/belt/security/tactical/amara_belt
name = "Mercenary belt"
desc = "A sturdy military belt with a shiny buckle and a bunch of pouches."
icon = 'icons/vore/custom_clothes_yw.dmi'
@@ -452,7 +452,7 @@
icon_override = 'icons/vore/custom_onmob_yw.dmi'
item_state = "pilotboots_mob"
-/obj/item/weapon/storage/belt/utility/fluff/sam_belt
+/obj/item/storage/belt/utility/fluff/sam_belt
name = "Mech Pilot Belt"
desc = "A white-blue toolbelt with many slots to hold tools in, seems to be made to literally be attached onto a suit."
icon = 'icons/vore/custom_clothes_yw.dmi'
@@ -515,7 +515,7 @@
//Raja Bastet
-/obj/item/weapon/storage/belt/utility/fluff/raja_belt
+/obj/item/storage/belt/utility/fluff/raja_belt
name = "Mech Engineer Belt"
desc = "A black-golden toolbelt with many slots to hold tools in. Also comes with a blue buckle."
icon = 'icons/vore/custom_clothes_yw.dmi'
@@ -907,7 +907,7 @@
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
flags_inv = HIDEHOLSTER
- allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper)
+ allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_override = 'icons/vore/custom_onmob_yw.dmi'
@@ -1054,7 +1054,7 @@
icon_state = "jiao_boots"
icon_override = 'icons/vore/custom_onmob_yw.dmi'
-/obj/item/weapon/storage/belt/medical/fluff/jiao_belt
+/obj/item/storage/belt/medical/fluff/jiao_belt
name = "Navy medical belt"
desc = "A customized medical belt to sport the navy colors of the Kanghu force."
icon = 'icons/vore/custom_clothes_yw.dmi'
@@ -1113,7 +1113,7 @@
//Saur Darastrix
-/obj/item/weapon/storage/backpack/dufflebag/fluff/saur_dufflebag
+/obj/item/storage/backpack/dufflebag/fluff/saur_dufflebag
name = "Saur's Dufflebag"
desc = "A large custom made dufflebag to fit snug between a pair of wings, fitted with custom purple straps and golden medical cross, with the name 'Saur Darastrix' written under it."
icon = 'icons/vore/custom_clothes_yw.dmi'
@@ -1552,14 +1552,14 @@
siemens_coefficient = 0.9
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) // Inferior to sec vests in bullet/laser but better for environmental protection.
allowed = list(
- /obj/item/device/flashlight,
- /obj/item/weapon/gun,
+ /obj/item/flashlight,
+ /obj/item/gun,
/obj/item/ammo_magazine,
- /obj/item/weapon/melee,
- /obj/item/weapon/material/knife,
- /obj/item/weapon/tank,
- /obj/item/device/radio,
- /obj/item/weapon/pickaxe
+ /obj/item/melee,
+ /obj/item/material/knife,
+ /obj/item/tank,
+ /obj/item/radio,
+ /obj/item/pickaxe
)
/obj/item/clothing/head/hood/mocha_hood
@@ -1600,7 +1600,7 @@
// ******
// Foxicide
// ******
-/obj/item/weapon/storage/backpack/fluff/kaith
+/obj/item/storage/backpack/fluff/kaith
name = "Light duffle bag"
desc = "A compact duffle bag, meant for long hikes."
icon = 'icons/inventory/back/item.dmi'
@@ -1747,4 +1747,4 @@
icon_state = "gear_harness_white"
icon_override = 'icons/vore/custom_onmob_yw.dmi'
item_state = "gear_harness_white"
- body_parts_covered = 0
\ No newline at end of file
+ body_parts_covered = 0
diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm
index d9a4cf4cc1..5f516d9951 100644
--- a/code/modules/vore/fluffstuff/custom_items_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_items_yw.dm
@@ -1,14 +1,14 @@
// **************
// Unleashed_Mana
// **************
-/obj/item/weapon/fluff/zekewatch
+/obj/item/fluff/zekewatch
name = "Zeke's pocketwatch"
desc = "Looks like it's broken... or is it?"
w_class = 1.0
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "zekewatch"
-/obj/item/weapon/fluff/zekewatch/attack_self(mob/living/user)
+/obj/item/fluff/zekewatch/attack_self(mob/living/user)
if(user.r_hand == src || user.l_hand == src)
var/time1 = rand(0,11)
var/time2 = rand(0,59)
@@ -23,19 +23,19 @@
return ..()
return
-/obj/item/weapon/kitchenknife/tacknife/unathiknife/fluff/eravik_vessi_1
+/obj/item/kitchenknife/tacknife/unathiknife/fluff/eravik_vessi_1
name = "Noctis"
desc = "A strange blade made of some kind of black metal. It feels... incomplete."
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "eravikblade"
-/obj/item/weapon/reagent_containers/food/drinks/flask/fluff/david_3
+/obj/item/reagent_containers/food/drinks/flask/fluff/david_3
name = "David's lucky bottle"
desc = "As long as there is something in it, nothing can go wrong."
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "davidbottle"
-/obj/item/weapon/material/kitchen/utensil/fork/fluff/ragna_1
+/obj/item/material/kitchen/utensil/fork/fluff/ragna_1
name = "Ragna's fork"
desc = "\"FEAR RAGNA!\""
icon = 'icons/vore/custom_items_yw.dmi'
@@ -47,7 +47,7 @@
// Capt_matt
// *********
//Payton Joghs
-/obj/item/weapon/material/hatchet/unathiknife/fluff/payton_joghs_1
+/obj/item/material/hatchet/unathiknife/fluff/payton_joghs_1
name = "Payton's Knife"
desc = "It appears to be a traditional unathi knife, though with 'Payton' written on the side and appearing to be made of steel."
icon = 'icons/vore/custom_items_yw.dmi'
@@ -56,7 +56,7 @@
// **************
// BlackAngelsAce
// **************
-/obj/item/weapon/oldtwohanded/spear/fluff/madoka_koto_1
+/obj/item/oldtwohanded/spear/fluff/madoka_koto_1
icon = 'icons/vore/custom_items_yw.dmi'
icon_override = 'icons/vore/custom_items_yw.dmi'
icon_state = "madokaspear0"
@@ -91,7 +91,7 @@
playsound(user, 'sound/misc/boatswain.ogg', 25, 1)
cooldown = world.time
-/obj/item/device/radio/headset/fluff/strix
+/obj/item/radio/headset/fluff/strix
name = "Strix\'s headset"
desc = "A headset that seems custom made for a avali skull shape, the sounds coming from it are very quiet."
icon_state = "strix_headset"
@@ -106,12 +106,12 @@
//Amara Faell
-/obj/item/weapon/flame/lighter/zippo/fluff/amara
+/obj/item/flame/lighter/zippo/fluff/amara
desc = "A zippo that comes in a metallic blood red case. How the flame can be lime green is an enigma in itself."
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "bloodredzippo"
-/obj/item/device/modkit_conversion/fluff/amara_hos_kit
+/obj/item/modkit_conversion/fluff/amara_hos_kit
name = "Amara's modkit"
desc = "A kit containing all the needed tools and parts to modify a Head of security armored coat. It has a red wolf painted on it."
owner_ckey = "generalpantsu"
@@ -124,7 +124,7 @@
//Nika Domashev
-/obj/item/device/modkit_conversion/fluff/nika_sec_kit
+/obj/item/modkit_conversion/fluff/nika_sec_kit
name = "Nika's modkit"
desc = "A kit containing all the needed tools and parts to modify a Officer Armor Vest."
owner_ckey = "generalpantsu"
@@ -140,7 +140,7 @@
// *******
//Glitterpaws
-/obj/item/weapon/melee/goz_whitecane
+/obj/item/melee/goz_whitecane
name = "White Cane"
desc = "A telescoping white cane. They are commonly used by the blind or visually impaired as a mobility tool or as a courtesy to others."
icon = 'icons/vore/custom_items_yw.dmi'
@@ -154,7 +154,7 @@
force = 3
var/on = 0
-/obj/item/weapon/melee/goz_whitecane/attack_self(mob/user as mob)
+/obj/item/melee/goz_whitecane/attack_self(mob/user as mob)
on = !on
if(on)
user.visible_message("\The [user] extends the white cane.",\
@@ -185,7 +185,7 @@
return
-/obj/item/weapon/melee/goz_whitecane/attack(mob/M as mob, mob/user as mob)
+/obj/item/melee/goz_whitecane/attack(mob/M as mob, mob/user as mob)
if(user.a_intent == I_HELP)
user.visible_message("\The [user] has lightly tapped [M] on the ankle with their white cane!")
return
@@ -195,13 +195,13 @@
// *******
// Dawidoe
// *******
-/obj/item/weapon/flame/lighter/zippo/fluff/melissa
+/obj/item/flame/lighter/zippo/fluff/melissa
name = "Zippo"
desc = "A custom made zippo lighter with word 'Mel' engraved in white font on the bottom right corner. It's black, with red lines around the edges."
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "melzippo"
-/obj/item/device/modkit_conversion/fluff/melissa_gun_kit
+/obj/item/modkit_conversion/fluff/melissa_gun_kit
name = "Melissa's modkit"
desc = "A kit containing all the needed tools and parts to modify a 45 Pistol."
owner_ckey = "dawidoe"
@@ -209,8 +209,8 @@
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "modkit"
- from_suit = /obj/item/weapon/gun/projectile/sec/flash
- to_suit = /obj/item/weapon/gun/projectile/fluff/m1911
+ from_suit = /obj/item/gun/projectile/sec/flash
+ to_suit = /obj/item/gun/projectile/fluff/m1911
// ************
// championfire
@@ -218,10 +218,10 @@
//Yuki Windroar
-/obj/item/weapon/implanter/reagent_generator/roiz/yuki
- implant_type = /obj/item/weapon/implant/reagent_generator/roiz/yuki
+/obj/item/implanter/reagent_generator/roiz/yuki
+ implant_type = /obj/item/implant/reagent_generator/roiz/yuki
-/obj/item/weapon/implant/reagent_generator/roiz/yuki
+/obj/item/implant/reagent_generator/roiz/yuki
name = "egg laying implant"
desc = "This is an implant that allows the user to lay eggs."
usable_volume = 500
@@ -237,7 +237,7 @@
//Jessica Mayer
-/obj/item/device/modkit_conversion/fluff/jessica_sec_kit
+/obj/item/modkit_conversion/fluff/jessica_sec_kit
name = "Jessica's modkit"
desc = "A kit containing all the needed tools and parts to modify a Officer Armor Vest."
owner_ckey = "vitorhks"
@@ -254,7 +254,7 @@
//Dillan McGraw
-// /obj/item/weapon/storage/fluff/cane/dillan
+// /obj/item/storage/fluff/cane/dillan
// var/max_w_class = 1
// var/max_storage_space = 4
// throwforce = 7
@@ -276,7 +276,7 @@
//Mira Rezus
-/obj/item/weapon/implant/reagent_generator/tempest/mira
+/obj/item/implant/reagent_generator/tempest/mira
name = "lactation implant"
desc = "This is an implant that allows the user to lactate."
usable_volume = 1000
@@ -289,12 +289,12 @@
verb_name = "Milk"
verb_desc = "Grab Mira's breasts and milk her, storing her fresh, warm milk in a container. This will undoubtedly turn her on."
-/obj/item/weapon/implanter/reagent_generator/mira
- implant_type = /obj/item/weapon/implant/reagent_generator/tempest/mira
+/obj/item/implanter/reagent_generator/mira
+ implant_type = /obj/item/implant/reagent_generator/tempest/mira
//Natalya Vospit
-/obj/item/weapon/implant/reagent_generator/tempest/natalya
+/obj/item/implant/reagent_generator/tempest/natalya
name = "lactation implant"
desc = "This is an implant that allows the user to lactate."
usable_volume = 1000
@@ -307,12 +307,12 @@
verb_name = "Milk"
verb_desc = "Grab Natalya's breasts and milk her, storing her fresh, warm milk in a container. This will undoubtedly turn her on."
-/obj/item/weapon/implanter/reagent_generator/natalya
- implant_type = /obj/item/weapon/implant/reagent_generator/tempest/natalya
+/obj/item/implanter/reagent_generator/natalya
+ implant_type = /obj/item/implant/reagent_generator/tempest/natalya
//Eryn Wolfe
-/obj/item/weapon/fluff/chemset
+/obj/item/fluff/chemset
name = "Eryn's chemistry set"
desc = "A small box with a open compartment, some buttons, a disk drive, and flashing lights. On the back is a small metal plaque with the name 'Eryn Wofle' on it."
w_class = 1.0
@@ -321,7 +321,7 @@
//Mitsuko Jiao
-/obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/a
+/obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/a
name = "Mitsuko's modkit Mk1"
desc = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
owner_ckey = "lukevale"
@@ -329,10 +329,10 @@
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "modkit"
- from_suit = /obj/item/device/healthanalyzer
- to_suit = /obj/item/device/healthanalyzer/fluff/jiao_health
+ from_suit = /obj/item/healthanalyzer
+ to_suit = /obj/item/healthanalyzer/fluff/jiao_health
-/obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/b
+/obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/b
name = "Mitsuko's modkit Mk2"
desc = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
owner_ckey = "lukevale"
@@ -340,10 +340,10 @@
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "modkit"
- from_suit = /obj/item/device/healthanalyzer/improved
- to_suit = /obj/item/device/healthanalyzer/improved/fluff/jiao_health
+ from_suit = /obj/item/healthanalyzer/improved
+ to_suit = /obj/item/healthanalyzer/improved/fluff/jiao_health
-/obj/item/device/modkit_conversion/fluff/jiao_anynlizer_kit/c
+/obj/item/modkit_conversion/fluff/jiao_anynlizer_kit/c
name = "Mitsuko's modkit Mk3"
desc = "A kit containing all the needed tools and parts to modify a heath analyzer. It has a Emblem painted on it."
owner_ckey = "lukevale"
@@ -351,22 +351,22 @@
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "modkit"
- from_suit = /obj/item/device/healthanalyzer/advanced
- to_suit = /obj/item/device/healthanalyzer/advanced/fluff/jiao_health
+ from_suit = /obj/item/healthanalyzer/advanced
+ to_suit = /obj/item/healthanalyzer/advanced/fluff/jiao_health
-/obj/item/device/healthanalyzer/fluff/jiao_health
+/obj/item/healthanalyzer/fluff/jiao_health
name = "Kanghu medical scanner MK1"
desc = "A Modified medical scanner, all the main components are compacted into the handle. This one is a basic unit."
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "scanner_mk1"
-/obj/item/device/healthanalyzer/improved/fluff/jiao_health
+/obj/item/healthanalyzer/improved/fluff/jiao_health
name = "Kanghu medical scanner MK2"
desc = "A Modified medical scanner, all the main components are compacted into the handle. This one is an improved unit."
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "scanner_mk2"
-/obj/item/device/healthanalyzer/advanced/fluff/jiao_health
+/obj/item/healthanalyzer/advanced/fluff/jiao_health
name = "Kanghu medical scanner MK3"
desc = "A Modified medical scanner, all the main components are compacted into the handle. This one is an advanced unit."
icon = 'icons/vore/custom_items_yw.dmi'
@@ -378,7 +378,7 @@
//Ire
-/obj/item/weapon/bikehorn/fluff/chew_ire
+/obj/item/bikehorn/fluff/chew_ire
name = "Chew toy"
desc = "A toy normally used by dogs to play with or chew on"
slot_flags = SLOT_MASK
@@ -396,7 +396,7 @@
//I'm going to fix this code later.
-/obj/item/weapon/implant/reagent_generator/belle/ysaline
+/obj/item/implant/reagent_generator/belle/ysaline
name = "lactation implant"
desc = "This is an implant that allows the user to lactate."
usable_volume = 1000
@@ -412,7 +412,7 @@
// **************
// Trash
// **************
-/obj/item/weapon/fluff/fidgetspinner
+/obj/item/fluff/fidgetspinner
name = "Fidget spinner"
desc = "A spinning stress relief toy, upsetting family, friends, and employers for 500 years."
w_class = 1.0
@@ -420,7 +420,7 @@
icon_state = "fidgetspinner"
var/basestate = "fidgetspinner"
-/obj/item/weapon/fluff/fidgetspinner/red
+/obj/item/fluff/fidgetspinner/red
name = "Red fidget spinner"
desc = "A spinning stress relief toy, upsetting family, friends, and employers for 500 years. This one is red"
w_class = 1.0
@@ -428,7 +428,7 @@
icon_state = "fidgetspinnerr"
basestate = "fidgetspinnerr"
-/obj/item/weapon/fluff/fidgetspinner/yellow
+/obj/item/fluff/fidgetspinner/yellow
name = "Yellow fidget spinner"
desc = "A spinning stress relief toy, upsetting family, friends, and employers for 500 years. This one is yellow"
w_class = 1.0
@@ -436,7 +436,7 @@
icon_state = "fidgetspinnery"
basestate = "fidgetspinnery"
-/obj/item/weapon/fluff/fidgetspinner/attack_self(mob/living/user)
+/obj/item/fluff/fidgetspinner/attack_self(mob/living/user)
if(user.r_hand == src || user.l_hand == src)
if(icon_state != "[basestate]-s")
icon_state = "[basestate]-s"
@@ -447,14 +447,14 @@
return ..()
return
-/obj/item/weapon/fluff/squeezetoy
+/obj/item/fluff/squeezetoy
name = "Stress relief squeeze toy"
desc = "A toy squeezed to relieve stress, it’s squeaker appears to be broken from over use."
w_class = 1.0
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "squeezetoy"
-/obj/item/weapon/fluff/squeezetoy/attack_self(mob/living/user)
+/obj/item/fluff/squeezetoy/attack_self(mob/living/user)
if(user.r_hand == src || user.l_hand == src)
if(icon_state != "squeezetoy-s")
icon_state = "squeezetoy-s"
@@ -465,7 +465,7 @@
return ..()
return
-/obj/item/weapon/fluff/dimensioncube
+/obj/item/fluff/dimensioncube
var/folded = 1
name = "Infinity cube"
desc = "All the fun of a puzzle cube without any of the challenge, a good way to relieve stress and delude yourself into a sense of accomplishment."
@@ -473,7 +473,7 @@
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "infinitycube0"
-/obj/item/weapon/fluff/dimensioncube/attack_self(mob/living/user)
+/obj/item/fluff/dimensioncube/attack_self(mob/living/user)
if(user.r_hand == src || user.l_hand == src)
if(folded == 0)
icon_state = "infinitycube0"
@@ -492,7 +492,7 @@
// **************
// These seem to have been deprecated from loadouts? -KK
-/obj/item/device/modkit_conversion/fluff/skinner/a
+/obj/item/modkit_conversion/fluff/skinner/a
name = "Joseph's modkit Mk1"
desc = "A kit containing all the needed tools and parts to modify a security jumpsuit."
@@ -502,7 +502,7 @@
from_suit = /obj/item/clothing/under/rank/security
to_suit = /obj/item/clothing/under/rank/security/fluff/skinner
-/obj/item/device/modkit_conversion/fluff/skinner/b
+/obj/item/modkit_conversion/fluff/skinner/b
name = "Joseph's modkit Mk2"
desc = "A kit containing all the needed tools and parts to modify a security armor."
@@ -512,7 +512,7 @@
from_suit = /obj/item/clothing/suit/armor/vest
to_suit = /obj/item/clothing/suit/armor/vest/fluff/skinner
-/obj/item/device/modkit_conversion/fluff/skinner/c
+/obj/item/modkit_conversion/fluff/skinner/c
name = "Joseph's modkit Mk3"
desc = "A kit containing all the needed tools and parts to modify a security helmet."
@@ -526,7 +526,7 @@
// DeepIndigo
// **************
-/obj/item/weapon/storage/bible/fluff/amina
+/obj/item/storage/bible/fluff/amina
name = "New Space Pioneer's Bible"
desc = "This one says it was printed in 2492. The name \"Eric Hayvers\" is written on the inside of the cover, crossed out. Under it is written \"Kouri, Amina, Marine Unit 14, Fifth Echelon. Service number NTN-5528928522372\""
@@ -534,15 +534,15 @@
// DameonOwen
// **************
-/obj/item/weapon/reagent_containers/food/snacks/cookie/mysterious
+/obj/item/reagent_containers/food/snacks/cookie/mysterious
name = "a mysterious cookie"
desc = "DAS A BIG COOKIE!!!"
bitesize = 100
-/obj/item/weapon/reagent_containers/food/snacks/cookie/mysterious/Initialize()
+/obj/item/reagent_containers/food/snacks/cookie/mysterious/Initialize()
. = ..()
-/obj/item/weapon/reagent_containers/food/snacks/cookie/mysterious/attack(mob/living/M as mob, mob/user as mob, def_zone)
+/obj/item/reagent_containers/food/snacks/cookie/mysterious/attack(mob/living/M as mob, mob/user as mob, def_zone)
. = ..()
if (M == user)
M.resize(3)
@@ -555,7 +555,7 @@
// **************
//Lucy Price
-/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/lucyprice
+/obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/lucyprice
name = "Cryostasis Thermos"
desc = " A thermos that has been designed to look something akin to a mix between a cryostasis beaker and a thermos. Does NOT keep the drinks cold, surprisingly enough."
icon_state = "cryothermos"
@@ -566,7 +566,7 @@
// **************
//Mocha
-/obj/item/device/modkit_conversion/fluff/mocha_suit_kit
+/obj/item/modkit_conversion/fluff/mocha_suit_kit
name = "Mocha's modkit"
desc = "A kit containing all the needed tools and parts to modify a Explorer Suit"
owner_ckey = "mocatheporg1"
@@ -580,14 +580,14 @@
// *************
// Foxicide
// *************
-/obj/item/weapon/material/knife/tacknife/survival/fluff/kaith
+/obj/item/material/knife/tacknife/survival/fluff/kaith
name = "Trusty Survival Knife"
desc = "An old looking knife with an outdated wooden handle. Still looks robust, though."
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "kaithknife"
named_from_material = 0
-/obj/item/device/modkit_conversion/fluff/kaith_knife_kit
+/obj/item/modkit_conversion/fluff/kaith_knife_kit
name = "Kaith's modkit"
desc = "A kit containing all the needed tools and parts to modify a survival knife"
owner_ckey = "foxicide"
@@ -595,39 +595,39 @@
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "modkit"
- from_suit = /obj/item/weapon/material/knife/tacknife/survival
- to_suit = /obj/item/weapon/material/knife/tacknife/survival/fluff/kaith
+ from_suit = /obj/item/material/knife/tacknife/survival
+ to_suit = /obj/item/material/knife/tacknife/survival/fluff/kaith
// *************
// Coda_Vanistok
// *************
-/obj/item/weapon/implanter/fluff/coda
- imp = new /obj/item/weapon/implant/fluff/coda
+/obj/item/implanter/fluff/coda
+ imp = new /obj/item/implant/fluff/coda
icon_state = "implanter1_1"
-/obj/item/weapon/implanter/fluff/coda/remove_implant() //No way to remove this implant.
+/obj/item/implanter/fluff/coda/remove_implant() //No way to remove this implant.
to_chat(usr, "It seems \the [imp] can't be removed from \the [src].")
return
-/obj/item/weapon/implanter/fluff/coda/attack()
+/obj/item/implanter/fluff/coda/attack()
..()
if(!imp) //After injection, the implanter poofs.
to_chat(usr, "\The [src] disentegrates after you use it!")
qdel(src)
-/obj/item/weapon/implant/fluff/coda
+/obj/item/implant/fluff/coda
name = "locked size-modification implant"
desc = "This is an implant that allows the user to change their size. It appears to be locked to two settings."
var/mob/living/implanted_in = null
-/obj/item/weapon/implant/fluff/coda/post_implant(mob/source)
+/obj/item/implant/fluff/coda/post_implant(mob/source)
..()
var/mob/living/H = source
- H.verbs += /obj/item/weapon/implant/fluff/coda/proc/coda_implant_resize
+ H.verbs += /obj/item/implant/fluff/coda/proc/coda_implant_resize
implanted_in = source
START_PROCESSING(SSobj, src)
-/obj/item/weapon/implant/fluff/coda/process()
+/obj/item/implant/fluff/coda/process()
if(implanted_in && (src.imp_in != implanted_in)) //If the implant is removed.
implanted_in.setBrainLoss(200)
visible_message("\The [src] shorts and sparks during removal, frying itself!")
@@ -638,7 +638,7 @@
icon_state = "implant_melted"
malfunction = MALFUNCTION_PERMANENT
-/obj/item/weapon/implant/fluff/coda/proc/coda_implant_resize(var/mob/living/carbon/human/H)
+/obj/item/implant/fluff/coda/proc/coda_implant_resize(var/mob/living/carbon/human/H)
set name = "Resize (Implant)"
set desc = "Change your size between two different preset options."
set category = "IC"
@@ -654,7 +654,7 @@
// *************
// Dopiotl
// *************
-/obj/item/weapon/storage/secure/briefcase/fluff/jeans
+/obj/item/storage/secure/briefcase/fluff/jeans
name = "Sweet Ebony"
desc = "An ebony/wooden secure case lined with gold. It looks thick, heavy, expensive, and incredibly sturdy. The design is sleek and elegant, adorned in intricate markings on the side, with hand-crafted artwork of a constellation you can't quite seem to recollect. It is surprisingly cold to the touch."
icon = 'icons/vore/custom_items_yw.dmi'
@@ -665,21 +665,21 @@
slot_r_hand_str = 'icons/vore/custom_items_right_hand_yw.dmi',
)
var/list/has_items = list(
- /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
- /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
- /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
- /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
- /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
- /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
- /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
- /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/reagent_containers/food/snacks/chocolatebar,
)
-/obj/item/weapon/storage/secure/briefcase/fluff/jeans/New() //this is entierly nessicary to spawn stuff. "FUN" -luke
+/obj/item/storage/secure/briefcase/fluff/jeans/New() //this is entierly nessicary to spawn stuff. "FUN" -luke
storage_slots = has_items.len
allowed = list()
for(var/P in has_items)
allowed += P
new P(src)
..()
- return
\ No newline at end of file
+ return
diff --git a/code/modules/vore/fluffstuff/custom_rigs_yw.dm b/code/modules/vore/fluffstuff/custom_rigs_yw.dm
index 435ff9e4a8..ab33fc01a3 100644
--- a/code/modules/vore/fluffstuff/custom_rigs_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_rigs_yw.dm
@@ -1,4 +1,4 @@
-/obj/item/device/modkit_conversion/fluff/sheri_rig_kit
+/obj/item/modkit_conversion/fluff/sheri_rig_kit
name = "Sheri's modkit"
desc = "A kit containing all the needed tools and parts to modify a Research Director rig suit. It has a snake painted on it."
owner_ckey = "esperkin"
@@ -6,10 +6,10 @@
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "modkit"
- from_suit = /obj/item/weapon/rig/hazmat
- to_suit = /obj/item/weapon/rig/hazmat/fluff/sheri
+ from_suit = /obj/item/rig/hazmat
+ to_suit = /obj/item/rig/hazmat/fluff/sheri
-/obj/item/weapon/rig/hazmat/fluff/sheri
+/obj/item/rig/hazmat/fluff/sheri
name = "AHS-VPR Control Module"
desc = "This is the control module for a prototype hazardous environment suit, designed to protect the wearer from radiation, pressure, and hostile aliens alike. This particular suit was designed to fit a naga, and is labeled as the model 'Viper'. A small tag on it marks it as belonging to a 'Sheri Calen'"
icon = 'icons/vore/rig_yw/rigs_module.dmi'
@@ -57,7 +57,7 @@
-/obj/item/weapon/rig/medical/equipped/fluff/saur
+/obj/item/rig/medical/equipped/fluff/saur
name = "AMR-DRGN"
desc = "This seems to be a highly customized Medical RIG suit, coloured black and purple, and with an added extendable plating to include a pair of wings and a tail comfortably within the suits protection. There's a nametag on the chest piece, and on the control module itself, with the name 'Saur Darastrix' on it."
icon = 'icons/vore/rig_yw/rigs_module.dmi'
@@ -85,4 +85,4 @@
/obj/item/clothing/gloves/gauntlets/rig/fluff/saur
icon = 'icons/vore/rig_yw/rigs_gauntlets.dmi'
- icon_override = 'icons/vore/rig_yw/rigs_gauntlets_onmob.dmi'
\ No newline at end of file
+ icon_override = 'icons/vore/rig_yw/rigs_gauntlets_onmob.dmi'
diff --git a/code/modules/yw-halo/covenant/species/kigyar/kigyar_ranger.dm b/code/modules/yw-halo/covenant/species/kigyar/kigyar_ranger.dm
index 4251834cd1..e73dacc6b9 100644
--- a/code/modules/yw-halo/covenant/species/kigyar/kigyar_ranger.dm
+++ b/code/modules/yw-halo/covenant/species/kigyar/kigyar_ranger.dm
@@ -25,7 +25,7 @@
)
matter = list("nanolaminate" = 1)
allowed = list(
- /obj/item/weapon/tank)
+ /obj/item/tank)
/obj/item/clothing/shoes/magboots/ranger_kigyar
diff --git a/code/modules/yw-halo/weapons/covenant/melee.dm b/code/modules/yw-halo/weapons/covenant/melee.dm
index bb23c17def..de020ef10c 100644
--- a/code/modules/yw-halo/weapons/covenant/melee.dm
+++ b/code/modules/yw-halo/weapons/covenant/melee.dm
@@ -3,7 +3,7 @@
icon = null
icon_state = null
-/obj/item/weapon/melee/energy/elite_sword
+/obj/item/melee/energy/elite_sword
name = "Type-1 Energy Weapon"
desc = "A small handle conceals the equipment required to generate a long shimmering blade of shaped plasma, capable of burning through most armor with ease."
icon = 'code/modules/yw-halo/weapons/icons/Covenant_Weapons.dmi'
@@ -25,27 +25,27 @@
unacidable = 1
var/decapitate = TRUE
-/obj/item/weapon/melee/energy/elite_sword/New()
+/obj/item/melee/energy/elite_sword/New()
. = ..()
- verbs += /obj/item/weapon/melee/energy/elite_sword/proc/enable_failsafe
+ verbs += /obj/item/melee/energy/elite_sword/proc/enable_failsafe
-/obj/item/weapon/melee/energy/elite_sword/proc/enable_failsafe()
+/obj/item/melee/energy/elite_sword/proc/enable_failsafe()
set name = "Enable weapon failsafe"
set category = "IC"
failsafe = 1
to_chat(usr,"WARNING! You enable [src]'s failsafe. [src] will now self destruct if you drop it while active.")
- verbs -= /obj/item/weapon/melee/energy/elite_sword/proc/enable_failsafe
- verbs += /obj/item/weapon/melee/energy/elite_sword/proc/disable_failsafe
+ verbs -= /obj/item/melee/energy/elite_sword/proc/enable_failsafe
+ verbs += /obj/item/melee/energy/elite_sword/proc/disable_failsafe
-/obj/item/weapon/melee/energy/elite_sword/proc/disable_failsafe()
+/obj/item/melee/energy/elite_sword/proc/disable_failsafe()
set name = "Disable weapon failsafe"
set category = "IC"
failsafe = 0
to_chat(usr,"You disable [src]'s failsafe. [src] will no longer self destruct if you drop it.")
- verbs += /obj/item/weapon/melee/energy/elite_sword/proc/enable_failsafe
- verbs -= /obj/item/weapon/melee/energy/elite_sword/proc/disable_failsafe
+ verbs += /obj/item/melee/energy/elite_sword/proc/enable_failsafe
+ verbs -= /obj/item/melee/energy/elite_sword/proc/disable_failsafe
-/obj/item/weapon/melee/energy/elite_sword/proc/change_misc_variables(var/deactivate = 0)
+/obj/item/melee/energy/elite_sword/proc/change_misc_variables(var/deactivate = 0)
if(deactivate)
item_icons = list(slot_l_hand_str = null,slot_r_hand_str = null)
item_state_slots = null
@@ -57,7 +57,7 @@
slot_r_hand_str = "[inhand_icon_state] r" )
hitsound = 'code/modules/yw-halo/sounds/Energyswordhit.ogg'
-/obj/item/weapon/melee/energy/elite_sword/activate(mob/living/user)
+/obj/item/melee/energy/elite_sword/activate(mob/living/user)
..()
to_chat(user, "\The [src] bursts from its handle.")
icon_state = icon_state_deployed
@@ -67,7 +67,7 @@
flags = NOBLOODY
change_misc_variables()
-/obj/item/weapon/melee/energy/elite_sword/deactivate(mob/living/user)
+/obj/item/melee/energy/elite_sword/deactivate(mob/living/user)
..()
icon_state = initial(icon_state)
to_chat(user, "\The [src] disappears in a flash of light.")
@@ -75,7 +75,7 @@
flags = null
change_misc_variables(1)
-/obj/item/weapon/melee/energy/elite_sword/dropped(var/mob/user)
+/obj/item/melee/energy/elite_sword/dropped(var/mob/user)
. = ..()
if(loc == null) //We probably shouldn't be exploding if we're in nullspace.
return
@@ -97,12 +97,12 @@
else
deactivate(user)
-/obj/item/weapon/melee/energy/elite_sword/attack(var/mob/m,var/mob/user)
+/obj/item/melee/energy/elite_sword/attack(var/mob/m,var/mob/user)
if(ismob(m) && hits_burn_mobs)
damtype = BURN
return ..()
-/obj/item/weapon/melee/energy/elite_sword/dagger
+/obj/item/melee/energy/elite_sword/dagger
name = "Energy Dagger"
desc = "Utilising the same technology as the type-1 energy weapon, this dagger projects blades of plasma."
icon = 'code/modules/yw-halo/weapons/icons/Covenant_Weapons.dmi'
@@ -115,15 +115,15 @@
edge = 0
sharp = 0
-/obj/item/weapon/melee/energy/elite_sword/dagger/activate(mob/living/user)
+/obj/item/melee/energy/elite_sword/dagger/activate(mob/living/user)
..()
w_class = ITEMSIZE_NORMAL
-/obj/item/weapon/melee/energy/elite_sword/dagger/deactivate(mob/living/user)
+/obj/item/melee/energy/elite_sword/dagger/deactivate(mob/living/user)
..()
w_class = ITEMSIZE_SMALL
-/obj/item/weapon/melee/energy/elite_sword/dagger/change_misc_variables(var/deactivate = 0)
+/obj/item/melee/energy/elite_sword/dagger/change_misc_variables(var/deactivate = 0)
if(deactivate)
item_icons = list(slot_l_hand_str = null,slot_r_hand_str = null)
item_state_slots = null
@@ -137,7 +137,7 @@
//HONOUR GUARD STAFF
-/obj/item/weapon/melee/energy/elite_sword/honour_staff
+/obj/item/melee/energy/elite_sword/honour_staff
name = "Honour Guard Staff"
desc = "A ceremonial staff typically wielded by Sangheili Honour Guards. While not fit for a true battle, it serves well for beating unruly unngoy."
icon = 'code/modules/yw-halo/weapons/icons/Covenant_Weapons.dmi'
@@ -157,7 +157,7 @@
slot_r_hand_str = 'code/modules/yw-halo/weapons/icons/Weapon_Inhands_right.dmi',
)
-/obj/item/weapon/melee/energy/elite_sword/honour_staff/change_misc_variables(var/deactivate = 0)
+/obj/item/melee/energy/elite_sword/honour_staff/change_misc_variables(var/deactivate = 0)
if(deactivate)
hitsound = "swing_hit"
damtype = HALLOSS
@@ -165,10 +165,10 @@
hitsound = 'code/modules/yw-halo/sounds/Energyswordhit.ogg'
damtype = BURN
-/obj/item/weapon/material/shard/shrapnel/blamite
+/obj/item/material/shard/shrapnel/blamite
name = "Blamite Blade"
-/obj/item/weapon/melee/blamite
+/obj/item/melee/blamite
name = "Blamite Weapon"
desc = "\
A weapon with a blade made of Blamite. An internal mechanism cultivates the quick growth of a blamite crystal, \
@@ -189,7 +189,7 @@ Luckily, this isn't a downside due to the explosive properties of such a large a
var/regen_at = -1
var/explode_damage = 60
-/obj/item/weapon/melee/blamite/update_icon()
+/obj/item/melee/blamite/update_icon()
if(regen_at != -1)
icon_state = "[initial(icon_state)]_handle"
else if(explode_at != -1)
@@ -197,7 +197,7 @@ Luckily, this isn't a downside due to the explosive properties of such a large a
else
icon_state = initial(icon_state)
-/obj/item/weapon/melee/blamite/proc/set_blade_active(var/active)
+/obj/item/melee/blamite/proc/set_blade_active(var/active)
if(active)
force = initial(force)
throwforce = initial(throwforce)
@@ -207,12 +207,12 @@ Luckily, this isn't a downside due to the explosive properties of such a large a
throwforce = 5
armor_penetration = 0
-/obj/item/weapon/melee/blamite/proc/regen_crystal()
+/obj/item/melee/blamite/proc/regen_crystal()
regen_at = -1
update_icon()
set_blade_active(1)
-/obj/item/weapon/melee/blamite/proc/det_in_hand()
+/obj/item/melee/blamite/proc/det_in_hand()
regen_at = world.time + regen_delay * 2
explode_at = -1
update_icon()
@@ -225,14 +225,14 @@ Luckily, this isn't a downside due to the explosive properties of such a large a
else
visible_message("[name] overloads, singing the air around it!")
-/obj/item/weapon/melee/blamite/proc/do_explode_in_player(var/mob/living/player, var/silent = FALSE)
+/obj/item/melee/blamite/proc/do_explode_in_player(var/mob/living/player, var/silent = FALSE)
//Kabloeey in a player//
if(player)
player.adjustFireLoss(explode_damage)
if(!silent)
player.visible_message("The embedded Blamite Blade overloads, burning [player.name]!")
-/obj/item/weapon/melee/blamite/proc/pre_explode_in_player(var/mob/living/user,var/mob/living/carbon/human/target, var/silent = FALSE)
+/obj/item/melee/blamite/proc/pre_explode_in_player(var/mob/living/user,var/mob/living/carbon/human/target, var/silent = FALSE)
if(!istype(target))
return
if(!silent)
@@ -242,15 +242,15 @@ Luckily, this isn't a downside due to the explosive properties of such a large a
update_icon()
set_blade_active(0)
//Create shard, embed in enemy. Delay explosion by timeframe, then check for shard again. If present, call do_explode_in_player()//
- var/obj/shard = new /obj/item/weapon/material/shard/shrapnel/blamite
+ var/obj/shard = new /obj/item/material/shard/shrapnel/blamite
shard.name = initial(shard.name)
var/obj/item/organ/external/embed_organ = pick(target.organs)
embed_organ.embed(shard)
spawn(explode_delay)
- if(target && locate(/obj/item/weapon/material/shard/shrapnel/blamite) in target.embedded)
+ if(target && locate(/obj/item/material/shard/shrapnel/blamite) in target.embedded)
do_explode_in_player(target, silent)
-/obj/item/weapon/melee/blamite/attack_self(var/mob/user)
+/obj/item/melee/blamite/attack_self(var/mob/user)
if(regen_at != -1)
to_chat(user,"[name] has no blade to prime for explosion!")
return
@@ -262,33 +262,33 @@ Luckily, this isn't a downside due to the explosive properties of such a large a
update_icon()
-/obj/item/weapon/melee/blamite/process()
+/obj/item/melee/blamite/process()
if(explode_at != -1 && world.time > explode_at)
det_in_hand()
if(regen_at != -1 && world.time > regen_at)
regen_crystal()
-/obj/item/weapon/melee/blamite/apply_hit_effect(var/mob/living/carbon/human/target, mob/living/user, var/hit_zone)
+/obj/item/melee/blamite/apply_hit_effect(var/mob/living/carbon/human/target, mob/living/user, var/hit_zone)
. = ..()
if(explode_at == -1 || . == 100 || !istype(target))
return
pre_explode_in_player(user,target)
-/obj/item/weapon/melee/blamite/cutlass
+/obj/item/melee/blamite/cutlass
name = "Blamite Cutlass"
icon_state = "bl_cutlass"
item_state = "blamite_cutlass"
force = 35
throwforce = 15
-/obj/item/weapon/melee/blamite/dagger
+/obj/item/melee/blamite/dagger
name = "Blamite Dagger"
icon_state = "bl_dag"
item_state = "blamite_dagger"
force = 25
throwforce = 10
-/obj/item/weapon/melee/baton/humbler/covenant
+/obj/item/melee/baton/humbler/covenant
name = "Type-12 Antipersonnel Incapacitator"
desc = "A retractable baton capable of inducing a large amount of pain via electrical shocks."
icon = 'code/modules/yw-halo/weapons/icons/Covenant_Weapons.dmi'
diff --git a/code/modules/yw-halo/weapons/covenant/shield_gauntlet.dm b/code/modules/yw-halo/weapons/covenant/shield_gauntlet.dm
index 535a2b6aec..5afa3f0548 100644
--- a/code/modules/yw-halo/weapons/covenant/shield_gauntlet.dm
+++ b/code/modules/yw-halo/weapons/covenant/shield_gauntlet.dm
@@ -21,7 +21,7 @@
var/active_slowdown_amount = 0.8 //Bracing to hide behind the shield.
var/overloaded = 0
- var/obj/item/weapon/gauntlet_shield/connected_shield
+ var/obj/item/gauntlet_shield/connected_shield
matter = list("nanolaminate" = 1)
var/time_next_warning = 0
diff --git a/code/modules/yw-halo/weapons/covenant/shield_gauntlet_effect.dm b/code/modules/yw-halo/weapons/covenant/shield_gauntlet_effect.dm
index 5274acca3f..c99d4324cf 100644
--- a/code/modules/yw-halo/weapons/covenant/shield_gauntlet_effect.dm
+++ b/code/modules/yw-halo/weapons/covenant/shield_gauntlet_effect.dm
@@ -1,6 +1,6 @@
//Physical shield object define//
-/obj/item/weapon/gauntlet_shield //The shield object that appears when you activate the gauntlet.
+/obj/item/gauntlet_shield //The shield object that appears when you activate the gauntlet.
name = "Handheld Shield"
desc = "A shimmering shield"
@@ -15,21 +15,21 @@
canremove = 0
var/obj/item/clothing/gloves/shield_gauntlet/creator_gauntlet
-/obj/item/weapon/gauntlet_shield/New(var/loc, var/obj/created_by)
+/obj/item/gauntlet_shield/New(var/loc, var/obj/created_by)
. = ..()
creator_gauntlet = created_by
-/obj/item/weapon/gauntlet_shield/equipped(var/mob/living/carbon/human/user)
+/obj/item/gauntlet_shield/equipped(var/mob/living/carbon/human/user)
if(istype(user) && user.gloves != creator_gauntlet)
user.drop_from_inventory(src)
qdel(src)
else
. = ..()
-/obj/item/weapon/gauntlet_shield/dropped()
+/obj/item/gauntlet_shield/dropped()
creator_gauntlet.hand_dropped()
. = ..()
qdel(src)
-/obj/item/weapon/gauntlet_shield/shield_gauntlet/examine(var/mob/user)
+/obj/item/gauntlet_shield/shield_gauntlet/examine(var/mob/user)
return creator_gauntlet.examine(user)
diff --git a/maps/redgate/fantasy_items.dm b/maps/redgate/fantasy_items.dm
index be4a7581b4..023d7a1d08 100644
--- a/maps/redgate/fantasy_items.dm
+++ b/maps/redgate/fantasy_items.dm
@@ -479,7 +479,7 @@
/obj/item/perfect_tele/magic/attack_self(mob/user, var/radial_menu_anchor = src)
if(loc_network)
- for(var/obj/item/device/perfect_tele_beacon/stationary/nb in GLOB.premade_tele_beacons) // YW EDIT: Glob
+ for(var/obj/item/perfect_tele_beacon/stationary/nb in GLOB.premade_tele_beacons) // YW EDIT: Glob
if(nb.tele_network == loc_network)
beacons[nb.tele_name] = nb
loc_network = null //Consumed
diff --git a/maps/submaps/surface_submaps/plains_yw/plains.dm b/maps/submaps/surface_submaps/plains_yw/plains.dm
index ecf8cc31f6..43a2660e14 100644
--- a/maps/submaps/surface_submaps/plains_yw/plains.dm
+++ b/maps/submaps/surface_submaps/plains_yw/plains.dm
@@ -1,7 +1,7 @@
// This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
// When adding a new PoI, please add it to this list.
-#if MAP_TEST
+#ifdef MAP_TEST
#include "farm1.dmm"
#include "construction1.dmm"
#include "camp1.dmm"
diff --git a/maps/yw/cryogaia.dm b/maps/yw/cryogaia.dm
index 6d11480cfd..530cfe445c 100644
--- a/maps/yw/cryogaia.dm
+++ b/maps/yw/cryogaia.dm
@@ -18,7 +18,7 @@
#include "../offmap_vr/common_offmaps.dm"
#include "yw_vrstuff/_vrmaps.dm"
- #if !AWAY_MISSION_TEST //Don't include these for just testing away missions
+ #ifndef AWAY_MISSION_TEST //Don't include these for just testing away missions
#include "cryogaia-01-centcomm.dmm" //centcom
#include "cryogaia-02-mining.dmm" //mining
#include "cryogaia-03-transit.dmm" //transit level
diff --git a/maps/yw/cryogaia_jobs.dm b/maps/yw/cryogaia_jobs.dm
index f5c3d5d0ed..afbb75611e 100644
--- a/maps/yw/cryogaia_jobs.dm
+++ b/maps/yw/cryogaia_jobs.dm
@@ -1,33 +1,33 @@
-/obj/item/weapon/card/id/medical/sar
+/obj/item/card/id/medical/sar
assignment = "Field Medic"
rank = "Field Medic"
icon_state = "cyan"
primary_color = rgb(47,189,189)
secondary_color = rgb(127,223,223)
-/obj/item/weapon/card/id/explorer
+/obj/item/card/id/explorer
name = "identification card"
desc = "A card issued to station exploration staff."
icon_state = "cyan"
primary_color = rgb(47,189,189)
secondary_color = rgb(127,223,223)
-/obj/item/weapon/card/id/explorer/pilot
+/obj/item/card/id/explorer/pilot
assignment = "Pilot"
rank = "Pilot"
-/obj/item/weapon/card/id/explorer/explorer
+/obj/item/card/id/explorer/explorer
assignment = "Explorer"
rank = "Explorer"
-/obj/item/weapon/card/id/explorer/head
+/obj/item/card/id/explorer/head
name = "identification card"
desc = "A card which represents discovery of the unknown."
icon_state = "cyanGold"
primary_color = rgb(47,189,189)
secondary_color = rgb(127,223,223)
-/obj/item/weapon/card/id/explorer/head/pathfinder
+/obj/item/card/id/explorer/head/pathfinder
assignment = "Pathfinder"
rank = "Pathfinder"
@@ -302,28 +302,28 @@
/decl/hierarchy/outfit/job/talon_captain
name = OUTFIT_JOB_NAME("Talon Captain")
- id_type = /obj/item/weapon/card/id/talon/captain
+ id_type = /obj/item/card/id/talon/captain
id_slot = slot_wear_id
pda_type = null
- l_ear = /obj/item/device/radio/headset/talon
+ l_ear = /obj/item/radio/headset/talon
glasses = /obj/item/clothing/glasses/sunglasses
uniform = /obj/item/clothing/under/rank/captain
shoes = /obj/item/clothing/shoes/brown
- backpack = /obj/item/weapon/storage/backpack/captain
- satchel_one = /obj/item/weapon/storage/backpack/satchel/cap
- messenger_bag = /obj/item/weapon/storage/backpack/messenger/com
+ backpack = /obj/item/storage/backpack/captain
+ satchel_one = /obj/item/storage/backpack/satchel/cap
+ messenger_bag = /obj/item/storage/backpack/messenger/com
/decl/hierarchy/outfit/job/talon_pilot
name = OUTFIT_JOB_NAME("Talon Pilot")
id_pda_assignment = "Pilot"
- id_type = /obj/item/weapon/card/id/talon/pilot
+ id_type = /obj/item/card/id/talon/pilot
id_slot = slot_wear_id
pda_type = null
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
- l_ear = /obj/item/device/radio/headset/talon
+ l_ear = /obj/item/radio/headset/talon
shoes = /obj/item/clothing/shoes/black
uniform = /obj/item/clothing/under/rank/pilot1/no_webbing
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
@@ -335,71 +335,71 @@
name = OUTFIT_JOB_NAME("Talon Doctor")
hierarchy_type = /decl/hierarchy/outfit/job
- id_type = /obj/item/weapon/card/id/talon/doctor
+ id_type = /obj/item/card/id/talon/doctor
id_slot = slot_wear_id
pda_type = null
- l_ear = /obj/item/device/radio/headset/talon
+ l_ear = /obj/item/radio/headset/talon
shoes = /obj/item/clothing/shoes/white
- backpack = /obj/item/weapon/storage/backpack/medic
- satchel_one = /obj/item/weapon/storage/backpack/satchel/med
- messenger_bag = /obj/item/weapon/storage/backpack/messenger/med
+ backpack = /obj/item/storage/backpack/medic
+ satchel_one = /obj/item/storage/backpack/satchel/med
+ messenger_bag = /obj/item/storage/backpack/messenger/med
uniform = /obj/item/clothing/under/rank/medical
suit = /obj/item/clothing/suit/storage/toggle/labcoat
- l_hand = /obj/item/weapon/storage/firstaid/regular
- r_pocket = /obj/item/device/flashlight/pen
+ l_hand = /obj/item/storage/firstaid/regular
+ r_pocket = /obj/item/flashlight/pen
/decl/hierarchy/outfit/job/talon_security
name = OUTFIT_JOB_NAME("Talon Security")
hierarchy_type = /decl/hierarchy/outfit/job
- id_type = /obj/item/weapon/card/id/talon/officer
+ id_type = /obj/item/card/id/talon/officer
id_slot = slot_wear_id
pda_type = null
- backpack_contents = list(/obj/item/weapon/handcuffs = 1)
+ backpack_contents = list(/obj/item/handcuffs = 1)
- l_ear = /obj/item/device/radio/headset/talon
+ l_ear = /obj/item/radio/headset/talon
gloves = /obj/item/clothing/gloves/black
shoes = /obj/item/clothing/shoes/boots/jackboots
- backpack = /obj/item/weapon/storage/backpack/security
- satchel_one = /obj/item/weapon/storage/backpack/satchel/sec
- messenger_bag = /obj/item/weapon/storage/backpack/messenger/sec
+ backpack = /obj/item/storage/backpack/security
+ satchel_one = /obj/item/storage/backpack/satchel/sec
+ messenger_bag = /obj/item/storage/backpack/messenger/sec
uniform = /obj/item/clothing/under/rank/security
- l_pocket = /obj/item/device/flash
+ l_pocket = /obj/item/flash
/decl/hierarchy/outfit/job/talon_engineer
name = OUTFIT_JOB_NAME("Talon Engineer")
hierarchy_type = /decl/hierarchy/outfit/job
- id_type = /obj/item/weapon/card/id/talon/engineer
+ id_type = /obj/item/card/id/talon/engineer
id_slot = slot_wear_id
pda_type = null
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
- l_ear = /obj/item/device/radio/headset/talon
- belt = /obj/item/weapon/storage/belt/utility/full
+ l_ear = /obj/item/radio/headset/talon
+ belt = /obj/item/storage/belt/utility/full
shoes = /obj/item/clothing/shoes/boots/workboots
- r_pocket = /obj/item/device/t_scanner
- backpack = /obj/item/weapon/storage/backpack/industrial
- satchel_one = /obj/item/weapon/storage/backpack/satchel/eng
- messenger_bag = /obj/item/weapon/storage/backpack/messenger/engi
+ r_pocket = /obj/item/t_scanner
+ backpack = /obj/item/storage/backpack/industrial
+ satchel_one = /obj/item/storage/backpack/satchel/eng
+ messenger_bag = /obj/item/storage/backpack/messenger/engi
uniform = /obj/item/clothing/under/rank/atmospheric_technician
- belt = /obj/item/weapon/storage/belt/utility/atmostech
+ belt = /obj/item/storage/belt/utility/atmostech
/decl/hierarchy/outfit/job/talon_miner
name = OUTFIT_JOB_NAME("Talon Miner")
hierarchy_type = /decl/hierarchy/outfit/job
- id_type = /obj/item/weapon/card/id/talon/miner
+ id_type = /obj/item/card/id/talon/miner
id_slot = slot_wear_id
pda_type = null
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
- l_ear = /obj/item/device/radio/headset/talon
+ l_ear = /obj/item/radio/headset/talon
shoes = /obj/item/clothing/shoes/boots/workboots
- r_pocket = /obj/item/weapon/storage/bag/ore
- l_pocket = /obj/item/weapon/tool/crowbar
+ r_pocket = /obj/item/storage/bag/ore
+ l_pocket = /obj/item/tool/crowbar
uniform = /obj/item/clothing/under/rank/talon/basic
- backpack = /obj/item/weapon/storage/backpack/talon
- satchel_one = /obj/item/weapon/storage/backpack/satchel/talon
- messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon
\ No newline at end of file
+ backpack = /obj/item/storage/backpack/talon
+ satchel_one = /obj/item/storage/backpack/satchel/talon
+ messenger_bag = /obj/item/storage/backpack/messenger/talon
diff --git a/maps/yw/cryogaia_telecomms.dm b/maps/yw/cryogaia_telecomms.dm
index ad949ab9f1..394a59c090 100644
--- a/maps/yw/cryogaia_telecomms.dm
+++ b/maps/yw/cryogaia_telecomms.dm
@@ -66,10 +66,10 @@
num2text(EXP_FREQ) = list(access_explorer)
)
-/obj/item/device/multitool/station_buffered
+/obj/item/multitool/station_buffered
name = "pre-linked multitool (tether hub)"
desc = "This multitool has already been linked to the Tether telecomms hub and can be used to configure one (1) relay."
-/obj/item/device/multitool/station_buffered/Initialize()
+/obj/item/multitool/station_buffered/Initialize()
. = ..()
buffer = locate(/obj/machinery/telecomms/hub/preset/cryogaia)
diff --git a/maps/yw/cryogaia_things.dm b/maps/yw/cryogaia_things.dm
index f9c9e94a9f..773e1ca32b 100644
--- a/maps/yw/cryogaia_things.dm
+++ b/maps/yw/cryogaia_things.dm
@@ -320,17 +320,17 @@
desc = "Wall-mounted Medical Equipment dispenser. This limited-use version dispenses antitoxins with mild painkillers for surface EVAs."
icon_state = "wallmed"
density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
- products = list(/obj/item/weapon/reagent_containers/pill/airlock = 10,/obj/item/device/healthanalyzer = 1)
- contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 2)
+ products = list(/obj/item/reagent_containers/pill/airlock = 10,/obj/item/healthanalyzer = 1)
+ contraband = list(/obj/item/reagent_containers/pill/tox = 2)
req_log_access = access_cmo
has_logs = 1
-/obj/item/weapon/reagent_containers/pill/airlock
+/obj/item/reagent_containers/pill/airlock
name = "\'Airlock\' Pill"
desc = "Neutralizes toxins and provides a mild analgesic effect."
icon_state = "pill2"
-/obj/item/weapon/reagent_containers/pill/airlock/New()
+/obj/item/reagent_containers/pill/airlock/New()
..()
reagents.add_reagent("anti_toxin", 15)
reagents.add_reagent("paracetamol", 5)
@@ -369,15 +369,15 @@
//Associate objects with the number of seconds it would take to de-ice a door.
//Most items are either more or less effecient at it.
//For items with very specific cases (like welders using fuel, or needing to be on) see attackby().
- deiceTools[/obj/item/weapon/ice_pick] = 3 //Ice Pick
- deiceTools[/obj/item/weapon/tool/crowbar] = 5 //Crowbar
- deiceTools[/obj/item/weapon/pen] = 30 //Pen
- deiceTools[/obj/item/weapon/card] = 35 //Cards. (Mostly ID cards)
+ deiceTools[/obj/item/ice_pick] = 3 //Ice Pick
+ deiceTools[/obj/item/tool/crowbar] = 5 //Crowbar
+ deiceTools[/obj/item/pen] = 30 //Pen
+ deiceTools[/obj/item/card] = 35 //Cards. (Mostly ID cards)
//Generic weapon items. Tools are better then weapons.
//This is for preventing "Sierra" syndrome that could result from needing very specific objects.
- deiceTools[/obj/item/weapon/tool] = 10
- deiceTools[/obj/item/weapon] = 12
+ deiceTools[/obj/item/tool] = 10
+ deiceTools[/obj/item] = 12
..()
/obj/machinery/door/airlock/glass_external/freezable/attackby(obj/item/I, mob/user as mob)
@@ -390,8 +390,8 @@
if(frozen)
//the welding tool is a special snowflake.
- if(istype(I, /obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/welder = I
+ if(istype(I, /obj/item/weldingtool))
+ var/obj/item/weldingtool/welder = I
if(welder.remove_fuel(0,user) && welder && welder.isOn())
to_chat(user, "You start to melt the ice off \the [src]")
playsound(src, welder.usesound, 50, 1)
@@ -400,7 +400,7 @@
unFreeze()
return
- if(istype(I, /obj/item/weapon/pen/crayon))
+ if(istype(I, /obj/item/pen/crayon))
to_chat(user, "You try to use \the [I] to clear the ice, but it crumbles away!")
qdel(I)
return
@@ -417,7 +417,7 @@
return
..()
-/obj/machinery/door/airlock/glass_external/freezable/proc/handleRemoveIce(obj/item/weapon/W as obj, mob/user as mob, var/time = 15 as num)
+/obj/machinery/door/airlock/glass_external/freezable/proc/handleRemoveIce(obj/item/W as obj, mob/user as mob, var/time = 15 as num)
to_chat(user, "You start to chip at the ice covering \the [src]")
if(do_after(user, text2num(time SECONDS)))
unFreeze()
@@ -492,9 +492,9 @@
/obj/structure/closet/secure_closet/guncabinet/excursion/New()
..()
for(var/i = 1 to 4)
- new /obj/item/weapon/gun/energy/locked/frontier(src)
+ new /obj/item/gun/energy/locked/frontier(src)
for(var/i = 1 to 4)
- new /obj/item/weapon/gun/energy/locked/frontier/holdout(src)
+ new /obj/item/gun/energy/locked/frontier/holdout(src)
// Used at centcomm for the elevator
/obj/machinery/cryopod/robot/door/dorms
@@ -512,9 +512,9 @@
// ### Wall Machines On Full Windows ###
// To make sure wall-mounted machines placed on full-tile windows are clickable they must be above the window
//
-/obj/item/device/radio/intercom
+/obj/item/radio/intercom
layer = ABOVE_WINDOW_LAYER
-/obj/item/weapon/storage/secure/safe
+/obj/item/storage/secure/safe
layer = ABOVE_WINDOW_LAYER
/obj/machinery/airlock_sensor
layer = ABOVE_WINDOW_LAYER
diff --git a/maps/yw/items/clothing/sc_suit.dm b/maps/yw/items/clothing/sc_suit.dm
index 302593d8fb..51892fa7b3 100644
--- a/maps/yw/items/clothing/sc_suit.dm
+++ b/maps/yw/items/clothing/sc_suit.dm
@@ -24,8 +24,8 @@
icon = 'maps/yw/icons/obj/sc_suit.dmi'
armor = list(melee = 15, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 5)
valid_accessory_slots = (ACCESSORY_SLOT_INSIGNIA)
- allowed = list (/obj/item/weapon/gun,/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
- /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit, /obj/item/device/analyzer,/obj/item/stack/medical,
- /obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,
- /obj/item/device/healthanalyzer,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,
- /obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle)
\ No newline at end of file
+ allowed = list (/obj/item/gun,/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes,
+ /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/analyzer,/obj/item/stack/medical,
+ /obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,
+ /obj/item/healthanalyzer,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,
+ /obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle)
diff --git a/maps/yw/items/encryptionkey_sc.dm b/maps/yw/items/encryptionkey_sc.dm
index 4d5c99f2b9..37e92735da 100644
--- a/maps/yw/items/encryptionkey_sc.dm
+++ b/maps/yw/items/encryptionkey_sc.dm
@@ -1,32 +1,32 @@
//Original Source: Southern Cross
-/obj/item/device/encryptionkey/pilot
+/obj/item/encryptionkey/pilot
name = "pilot's encryption key"
icon_state = "com_cypherkey"
channels = list("Supply" = 1, "Away Team" = 1)
-/obj/item/device/encryptionkey/explorer
+/obj/item/encryptionkey/explorer
name = "explorer radio encryption key"
icon_state = "com_cypherkey"
channels = list("Away Team" = 1)
-/obj/item/device/encryptionkey/sar
+/obj/item/encryptionkey/sar
name = "sar's encryption key"
icon_state = "med_cypherkey"
channels = list("Medical" = 1, "Away Team" = 1)
-/obj/item/device/encryptionkey/heads/hop
+/obj/item/encryptionkey/heads/hop
name = "head of personnel's encryption key"
icon_state = "hop_cypherkey"
channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 0, "Away Team" = 1)
-/obj/item/device/encryptionkey/heads/ai_integrated
+/obj/item/encryptionkey/heads/ai_integrated
name = "ai integrated encryption key"
desc = "Integrated encryption key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1,"Away Team" = 1)
-/obj/item/device/encryptionkey/heads/captain
+/obj/item/encryptionkey/heads/captain
name = "colony director's encryption key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0, "Away Team" = 0)
diff --git a/maps/yw/items/encryptionkey_vr.dm b/maps/yw/items/encryptionkey_vr.dm
index 23c5bb917b..d535ab4266 100644
--- a/maps/yw/items/encryptionkey_vr.dm
+++ b/maps/yw/items/encryptionkey_vr.dm
@@ -1,8 +1,8 @@
//Original Source: Southern Cross
-/obj/item/device/encryptionkey/pilot
+/obj/item/encryptionkey/pilot
icon_state = "cypherkey"
channels = list("Away Team" = 1)
-/obj/item/device/encryptionkey/explorer
+/obj/item/encryptionkey/explorer
channels = list("Away Team" = 1) //YW EDIT: Removes Science to come in line with our chain of Command
diff --git a/maps/yw/items/headset_sc.dm b/maps/yw/items/headset_sc.dm
index b84650a7f1..d5f9a0f9ce 100644
--- a/maps/yw/items/headset_sc.dm
+++ b/maps/yw/items/headset_sc.dm
@@ -1,37 +1,37 @@
//Original Source: Southern Cross
-/obj/item/device/radio/headset/pilot
+/obj/item/radio/headset/pilot
name = "pilot's headset"
desc = "A headset used by pilots, has access to supply and explorer channels."
icon_state = "pilot_headset"
adhoc_fallback = TRUE
- ks2type = /obj/item/device/encryptionkey/pilot
+ ks2type = /obj/item/encryptionkey/pilot
-/obj/item/device/radio/headset/pilot/alt
+/obj/item/radio/headset/pilot/alt
name = "pilot's bowman headset"
desc = "A bowman headset used by pilots, has access to supply and explorer channels."
icon_state = "pilot_headset_alt"
-/obj/item/device/radio/headset/explorer
+/obj/item/radio/headset/explorer
name = "explorer's headset"
desc = "Headset used by explorers for exploring. Access to the explorer channel."
icon_state = "exp_headset"
adhoc_fallback = TRUE
- ks2type = /obj/item/device/encryptionkey/explorer
+ ks2type = /obj/item/encryptionkey/explorer
-/obj/item/device/radio/headset/explorer/alt
+/obj/item/radio/headset/explorer/alt
name = "explorer's bowman headset"
desc = "Bowman headset used by explorers for exploring. Access to the explorer channel."
icon_state = "exp_headset_alt"
-/obj/item/device/radio/headset/sar
+/obj/item/radio/headset/sar
name = "sar radio headset"
desc = "A headset for search and rescue."
icon_state = "sar_headset"
adhoc_fallback = TRUE
- ks2type = /obj/item/device/encryptionkey/sar
+ ks2type = /obj/item/encryptionkey/sar
-/obj/item/device/radio/headset/sar/alt
+/obj/item/radio/headset/sar/alt
name = "sar radio bowman headset"
desc = "A bowman headset for search and rescue."
icon_state = "sar_headset_alt"
diff --git a/maps/yw/items/headset_vr.dm b/maps/yw/items/headset_vr.dm
index 8e42602fc1..95b9b567fc 100644
--- a/maps/yw/items/headset_vr.dm
+++ b/maps/yw/items/headset_vr.dm
@@ -1,28 +1,28 @@
//Original Source: Southern Cross
-/obj/item/device/radio/headset/pilot
+/obj/item/radio/headset/pilot
desc = "A headset used by pilots, has access to the explorer channel."
-/obj/item/device/radio/headset/pilot/alt
+/obj/item/radio/headset/pilot/alt
desc = "A bowman headset used by pilots, has access to the explorer channel."
-/obj/item/device/radio/headset/explorer
+/obj/item/radio/headset/explorer
desc = "Headset used by explorers for exploring. Access to explorer and science channels."
-/obj/item/device/radio/headset/explorer/alt
+/obj/item/radio/headset/explorer/alt
desc = "Bowman headset used by explorers for exploring. Access to explorer and science channels."
-/obj/item/device/radio/headset/sar
+/obj/item/radio/headset/sar
name = "fm radio headset"
desc = "A headset for field medics."
-/obj/item/device/radio/headset/sar/alt
+/obj/item/radio/headset/sar/alt
name = "fm radio bowman headset"
desc = "A bowman headset for field medics."
-/obj/item/device/radio/headset/volunteer
+/obj/item/radio/headset/volunteer
name = "volunteer's headset"
desc = "A headset used by volunteers to expedition teams, has access to the exploration channel."
icon_state = "pilot_headset"
adhoc_fallback = TRUE
- ks2type = /obj/item/device/encryptionkey/pilot
+ ks2type = /obj/item/encryptionkey/pilot
diff --git a/maps/yw/items/icepick.dm b/maps/yw/items/icepick.dm
index 110fcd882e..31c8452981 100644
--- a/maps/yw/items/icepick.dm
+++ b/maps/yw/items/icepick.dm
@@ -1,10 +1,10 @@
-//Ice pick, mountain axe, or ice axe.YW Creation.
-/obj/item/weapon/ice_pick
- name = "ice axe"
- desc = "A sharp tool for climbers and hikers to break up ice and keep themselves from slipping on a steep slope."
- icon = 'icons/obj/items_yw.dmi'
- icon_state = "icepick"
- item_state = "icepick"
- matter = list(MAT_STEEL = 12000) //Same as a knife
- force = 15 //increasing force for icepick/axe, cause it's a freaking iceaxe.
- throwforce = 0
\ No newline at end of file
+//Ice pick, mountain axe, or ice axe.YW Creation.
+/obj/item/ice_pick
+ name = "ice axe"
+ desc = "A sharp tool for climbers and hikers to break up ice and keep themselves from slipping on a steep slope."
+ icon = 'icons/obj/items_yw.dmi'
+ icon_state = "icepick"
+ item_state = "icepick"
+ matter = list(MAT_STEEL = 12000) //Same as a knife
+ force = 15 //increasing force for icepick/axe, cause it's a freaking iceaxe.
+ throwforce = 0
diff --git a/maps/yw/job/outfits.dm b/maps/yw/job/outfits.dm
index 36091b3819..65ad81bf3b 100644
--- a/maps/yw/job/outfits.dm
+++ b/maps/yw/job/outfits.dm
@@ -8,11 +8,11 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
name = OUTFIT_JOB_NAME("Explorer")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
- l_ear = /obj/item/device/radio/headset/explorer
+ l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
- pda_type = /obj/item/device/pda/explorer //VORESTation Edit - Better Brown
- id_type = /obj/item/weapon/card/id/explorer //VOREStation Edit
+ pda_type = /obj/item/pda/explorer //VORESTation Edit - Better Brown
+ id_type = /obj/item/card/id/explorer //VOREStation Edit
id_pda_assignment = "Explorer"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
@@ -24,13 +24,13 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
/decl/hierarchy/outfit/job/explorer2/technician
name = OUTFIT_JOB_NAME("Explorer Technician")
- belt = /obj/item/weapon/storage/belt/utility/full
+ belt = /obj/item/storage/belt/utility/full
pda_slot = slot_l_store
id_pda_assignment = "Explorer Technician"
/decl/hierarchy/outfit/job/explorer2/medic
name = OUTFIT_JOB_NAME("Explorer Medic")
- l_hand = /obj/item/weapon/storage/firstaid/regular
+ l_hand = /obj/item/storage/firstaid/regular
pda_slot = slot_l_store
id_pda_assignment = "Explorer Medic"
@@ -41,10 +41,10 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
- l_ear = /obj/item/device/radio/headset/pilot/alt
+ l_ear = /obj/item/radio/headset/pilot/alt
id_slot = slot_wear_id
pda_slot = slot_belt
- pda_type = /obj/item/device/pda //VOREStation Edit - Civilian
+ pda_type = /obj/item/pda //VOREStation Edit - Civilian
id_pda_assignment = "Pilot"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
@@ -53,11 +53,11 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
shoes = /obj/item/clothing/shoes/boots/winter/explorer
- l_ear = /obj/item/device/radio/headset/sar
- l_hand = /obj/item/weapon/storage/firstaid/regular
- belt = /obj/item/weapon/storage/belt/medical/emt
+ l_ear = /obj/item/radio/headset/sar
+ l_hand = /obj/item/storage/firstaid/regular
+ belt = /obj/item/storage/belt/medical/emt
pda_slot = slot_l_store
- pda_type = /obj/item/device/pda/sar //VOREStation Add
+ pda_type = /obj/item/pda/sar //VOREStation Add
id_pda_assignment = "Field Medic" //VOREStation Edit
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
@@ -66,11 +66,11 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
name = OUTFIT_JOB_NAME("Explorer")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
- l_ear = /obj/item/device/radio/headset/explorer
+ l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
- pda_type = /obj/item/device/pda/explorer //VORESTation Edit - Better Brown
- id_type = /obj/item/weapon/card/id/explorer/explorer //VOREStation Edit
+ pda_type = /obj/item/pda/explorer //VORESTation Edit - Better Brown
+ id_type = /obj/item/card/id/explorer/explorer //VOREStation Edit
id_pda_assignment = "Explorer"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
@@ -82,13 +82,13 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
/decl/hierarchy/outfit/job/explorer2/technician
name = OUTFIT_JOB_NAME("Explorer Technician")
- belt = /obj/item/weapon/storage/belt/utility/full
+ belt = /obj/item/storage/belt/utility/full
pda_slot = slot_l_store
id_pda_assignment = "Explorer Technician"
/decl/hierarchy/outfit/job/explorer2/medic
name = OUTFIT_JOB_NAME("Explorer Medic")
- l_hand = /obj/item/weapon/storage/firstaid/regular
+ l_hand = /obj/item/storage/firstaid/regular
pda_slot = slot_l_store
id_pda_assignment = "Explorer Medic"
@@ -99,11 +99,11 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
- l_ear = /obj/item/device/radio/headset/pilot/alt
+ l_ear = /obj/item/radio/headset/pilot/alt
id_slot = slot_wear_id
pda_slot = slot_belt
- pda_type = /obj/item/device/pda //VOREStation Edit - Civilian
- id_type = /obj/item/weapon/card/id/explorer/pilot //VOREStation Edit
+ pda_type = /obj/item/pda //VOREStation Edit - Civilian
+ id_type = /obj/item/card/id/explorer/pilot //VOREStation Edit
id_pda_assignment = "Pilot"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
@@ -112,12 +112,12 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
shoes = /obj/item/clothing/shoes/boots/winter/explorer
- l_ear = /obj/item/device/radio/headset/sar
- l_hand = /obj/item/weapon/storage/firstaid/regular
- belt = /obj/item/weapon/storage/belt/medical/emt
+ l_ear = /obj/item/radio/headset/sar
+ l_hand = /obj/item/storage/firstaid/regular
+ belt = /obj/item/storage/belt/medical/emt
pda_slot = slot_l_store
- pda_type = /obj/item/device/pda/sar //VOREStation Add
- id_type = /obj/item/weapon/card/id/medical/sar
+ pda_type = /obj/item/pda/sar //VOREStation Add
+ id_type = /obj/item/card/id/medical/sar
id_pda_assignment = "Field Medic" //VOREStation Edit
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
@@ -126,11 +126,11 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
name = OUTFIT_JOB_NAME("Pathfinder")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer //TODO: Uniforms.
- l_ear = /obj/item/device/radio/headset/explorer
+ l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
- pda_type = /obj/item/device/pda/pathfinder
- id_type = /obj/item/weapon/card/id/explorer/head/pathfinder
+ pda_type = /obj/item/pda/pathfinder
+ id_type = /obj/item/card/id/explorer/head/pathfinder
id_pda_assignment = "Pathfinder"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
@@ -141,5 +141,5 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
permit.set_name(H.real_name)
/decl/hierarchy/outfit/job/assistant/explorer
- id_type = /obj/item/weapon/card/id/explorer
+ id_type = /obj/item/card/id/explorer
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
diff --git a/maps/yw/job/outfits_yw.dm b/maps/yw/job/outfits_yw.dm
index e2976fb10c..74f3ca789f 100644
--- a/maps/yw/job/outfits_yw.dm
+++ b/maps/yw/job/outfits_yw.dm
@@ -2,11 +2,11 @@
name = OUTFIT_JOB_NAME("Pathfinder")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer //TODO: Uniforms.
- l_ear = /obj/item/device/radio/headset/explorer
+ l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
- pda_type = /obj/item/device/pda/pathfinder
- id_type = /obj/item/weapon/card/id/explorer/head
+ pda_type = /obj/item/pda/pathfinder
+ id_type = /obj/item/card/id/explorer/head
id_pda_assignment = "Pathfinder"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
@@ -17,5 +17,5 @@
permit.set_name(H.real_name)
/decl/hierarchy/outfit/job/assistant/explorer
- id_type = /obj/item/weapon/card/id/explorer
+ id_type = /obj/item/card/id/explorer
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
diff --git a/maps/yw/residential/_residential.dm b/maps/yw/residential/_residential.dm
index 393546cd01..770702bcda 100644
--- a/maps/yw/residential/_residential.dm
+++ b/maps/yw/residential/_residential.dm
@@ -69,7 +69,7 @@ var/global/list/latejoin_residential = list()
/datum/spawnpoint/residential
display_name = "NCS Serenity Residential"
- restrict_job = list("Off-duty Worker", "Off-duty Cargo", "Off-duty Engineer", "Off-duty Medic", "Off-duty Scientist", "Off-duty Officer", USELESS_JOB)
+ restrict_job = list("Off-duty Worker", "Off-duty Cargo", "Off-duty Engineer", "Off-duty Medic", "Off-duty Scientist", "Off-duty Officer", JOB_ALT_VISITOR)
msg = "has arrived on the NCS Serenity Residential level"
announce_channel = "Common"
diff --git a/maps/yw/residential/residential_keys.dm b/maps/yw/residential/residential_keys.dm
index 45759648e9..cc31d62be8 100644
--- a/maps/yw/residential/residential_keys.dm
+++ b/maps/yw/residential/residential_keys.dm
@@ -1,135 +1,135 @@
-/obj/item/weapon/card/id/residential
+/obj/item/card/id/residential
name = "generic residential key"
desc = "A keyring with a small steel key, and a blue fob."
icon = 'icons/obj/vehicles.dmi'
icon_state = "quad_keys"
-/obj/item/weapon/card/id/residential/rs1
+/obj/item/card/id/residential/rs1
name = "RS1 residential key"
access = list(8001)
-/obj/item/weapon/card/id/residential/rs2
+/obj/item/card/id/residential/rs2
name = "RS2 residential key"
access = list(8002)
-/obj/item/weapon/card/id/residential/rs3
+/obj/item/card/id/residential/rs3
name = "RS3 residential key"
access = list(8003)
-/obj/item/weapon/card/id/residential/rs4
+/obj/item/card/id/residential/rs4
name = "RS4 residential key"
access = list(8004)
-/obj/item/weapon/card/id/residential/rs5
+/obj/item/card/id/residential/rs5
name = "RS5 residential key"
access = list(8005)
-/obj/item/weapon/card/id/residential/rs6
+/obj/item/card/id/residential/rs6
name = "RS6 residential key"
access = list(8006)
-/obj/item/weapon/card/id/residential/rs7
+/obj/item/card/id/residential/rs7
name = "RS7 residential key"
access = list(8007)
-/obj/item/weapon/card/id/residential/rs8
+/obj/item/card/id/residential/rs8
name = "RS8 residential key"
access = list(8008)
-/obj/item/weapon/card/id/residential/rs9
+/obj/item/card/id/residential/rs9
name = "RS9 residential key"
access = list(8009)
-/obj/item/weapon/card/id/residential/rs10
+/obj/item/card/id/residential/rs10
name = "RS10 residential key"
access = list(8010)
-/obj/item/weapon/card/id/residential/rs11
+/obj/item/card/id/residential/rs11
name = "RS11 residential key"
access = list(8011)
-/obj/item/weapon/card/id/residential/rs12
+/obj/item/card/id/residential/rs12
name = "RS12 residential key"
access = list(8012)
-/obj/item/weapon/card/id/residential/rs13
+/obj/item/card/id/residential/rs13
name = "RS13 residential key"
access = list(8013)
-/obj/item/weapon/card/id/residential/rm1
+/obj/item/card/id/residential/rm1
name = "RM1 residential key"
access = list(8101)
-/obj/item/weapon/card/id/residential/rm2
+/obj/item/card/id/residential/rm2
name = "RM2 residential key"
access = list(8102)
-/obj/item/weapon/card/id/residential/rm4
+/obj/item/card/id/residential/rm4
name = "RM4 residential key"
access = list(8104)
-/obj/item/weapon/card/id/residential/mansion
+/obj/item/card/id/residential/mansion
name = "Mansion residential key"
access = list(8100)
//-SHIPS-
-/obj/item/weapon/card/id/residential/s1
+/obj/item/card/id/residential/s1
name = "S1 residential key"
access = list(8201)
-/obj/item/weapon/card/id/residential/s2
+/obj/item/card/id/residential/s2
name = "S2 residential key"
access = list(8202)
-/obj/item/weapon/card/id/residential/s3
+/obj/item/card/id/residential/s3
name = "S3 residential key"
access = list(8203)
-/obj/item/weapon/card/id/residential/s4
+/obj/item/card/id/residential/s4
name = "S4 residential key"
access = list(8204)
-/obj/item/weapon/card/id/residential/s5
+/obj/item/card/id/residential/s5
name = "S5 residential key"
access = list(8205)
-/obj/item/weapon/card/id/residential/s6
+/obj/item/card/id/residential/s6
name = "S6 residential key"
access = list(8206)
//FLUFF SPAWNS
/datum/gear/fluff/res_key_s1
- path = /obj/item/weapon/card/id/residential/s1
+ path = /obj/item/card/id/residential/s1
display_name = "S1 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_s2
- path = /obj/item/weapon/card/id/residential/s2
+ path = /obj/item/card/id/residential/s2
display_name = "S2 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_s3
- path = /obj/item/weapon/card/id/residential/s3
+ path = /obj/item/card/id/residential/s3
display_name = "S3 keys"
description = "residential"
ckeywhitelist = list("blackangelsace")
character_name = list("Strix Hades")
/datum/gear/fluff/res_key_s4
- path = /obj/item/weapon/card/id/residential/s4
+ path = /obj/item/card/id/residential/s4
display_name = "S4 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_s5
- path = /obj/item/weapon/card/id/residential/s5
+ path = /obj/item/card/id/residential/s5
display_name = "S5 keys"
description = "residential"
ckeywhitelist = list("")
@@ -138,21 +138,21 @@
// MEDIUM KEYS
/datum/gear/fluff/res_key_rm1
- path = /obj/item/weapon/card/id/residential/rm1
+ path = /obj/item/card/id/residential/rm1
display_name = "RM1 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_rm2
- path = /obj/item/weapon/card/id/residential/rm2
+ path = /obj/item/card/id/residential/rm2
display_name = "RM2 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_rm4
- path = /obj/item/weapon/card/id/residential/rm4
+ path = /obj/item/card/id/residential/rm4
display_name = "RM4 keys"
description = "Residential keys for Large Room 4 on the Serenity"
ckeywhitelist = list("montessquio", "cryptidbun")
@@ -162,91 +162,91 @@
// SMALL KEYS
/datum/gear/fluff/res_key_rs1
- path = /obj/item/weapon/card/id/residential/rs1
+ path = /obj/item/card/id/residential/rs1
display_name = "RS1 keys"
description = "residential"
ckeywhitelist = list("dushka")
character_name = list("Skraw'laar")
/datum/gear/fluff/res_key_rs2
- path = /obj/item/weapon/card/id/residential/rs2
+ path = /obj/item/card/id/residential/rs2
display_name = "RS2 keys"
description = "residential"
ckeywhitelist = list("hidingdan")
character_name = list("Violet Ashe")
/datum/gear/fluff/res_key_rs3
- path = /obj/item/weapon/card/id/residential/rs3
+ path = /obj/item/card/id/residential/rs3
display_name = "RS3 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_rs4
- path = /obj/item/weapon/card/id/residential/rs4
+ path = /obj/item/card/id/residential/rs4
display_name = "RS4 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_rs5
- path = /obj/item/weapon/card/id/residential/rs5
+ path = /obj/item/card/id/residential/rs5
display_name = "RS5 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_rs6
- path = /obj/item/weapon/card/id/residential/rs6
+ path = /obj/item/card/id/residential/rs6
display_name = "RS6 keys"
description = "residential"
ckeywhitelist = list("izac112")
character_name = list("Jill Chambers")
/datum/gear/fluff/res_key_rs7
- path = /obj/item/weapon/card/id/residential/rs7
+ path = /obj/item/card/id/residential/rs7
display_name = "RS7 keys"
description = "residential"
ckeywhitelist = list("dopiotl", "deepindigo")
character_name = list("Jeanne Petite", "Kahlia 188")
/datum/gear/fluff/res_key_rs8
- path = /obj/item/weapon/card/id/residential/rs8
+ path = /obj/item/card/id/residential/rs8
display_name = "RS8 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_rs9
- path = /obj/item/weapon/card/id/residential/rs9
+ path = /obj/item/card/id/residential/rs9
display_name = "RS9 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_rs10
- path = /obj/item/weapon/card/id/residential/rs10
+ path = /obj/item/card/id/residential/rs10
display_name = "RS10 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_rs11
- path = /obj/item/weapon/card/id/residential/rs11
+ path = /obj/item/card/id/residential/rs11
display_name = "RS11 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_rs12
- path = /obj/item/weapon/card/id/residential/rs12
+ path = /obj/item/card/id/residential/rs12
display_name = "RS12 keys"
description = "residential"
ckeywhitelist = list("")
character_name = list("")
/datum/gear/fluff/res_key_rs13
- path = /obj/item/weapon/card/id/residential/rs13
+ path = /obj/item/card/id/residential/rs13
display_name = "RS13 keys"
description = "residential"
ckeywhitelist = list("jaybird1")
diff --git a/maps/yw/structures/closets/engineering.dm b/maps/yw/structures/closets/engineering.dm
index e6b19269ae..a2214ab97c 100644
--- a/maps/yw/structures/closets/engineering.dm
+++ b/maps/yw/structures/closets/engineering.dm
@@ -13,20 +13,20 @@
/obj/item/clothing/under/rank/chief_engineer/skirt,
/obj/item/clothing/head/hardhat/white,
/obj/item/clothing/shoes/brown,
- /obj/item/weapon/cartridge/ce,
- /obj/item/device/radio/headset/heads/ce,
- /obj/item/device/radio/headset/heads/ce/alt,
+ /obj/item/cartridge/ce,
+ /obj/item/radio/headset/heads/ce,
+ /obj/item/radio/headset/heads/ce/alt,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
- /obj/item/weapon/tank/emergency/oxygen/engi,
+ /obj/item/tank/emergency/oxygen/engi,
/obj/item/taperoll/engineering,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering)
/obj/structure/closet/secure_closet/engineering_chief_wardrobe/Initialize()
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/industrial
+ starts_with += /obj/item/storage/backpack/industrial
else
- starts_with += /obj/item/weapon/storage/backpack/satchel/eng
+ starts_with += /obj/item/storage/backpack/satchel/eng
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
+ starts_with += /obj/item/storage/backpack/dufflebag/eng
return ..()
diff --git a/maps/yw/structures/closets/medical.dm b/maps/yw/structures/closets/medical.dm
index 52b668000a..c386cbf956 100644
--- a/maps/yw/structures/closets/medical.dm
+++ b/maps/yw/structures/closets/medical.dm
@@ -13,20 +13,20 @@
/obj/item/clothing/under/rank/chief_medical_officer/skirt,
/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
- /obj/item/weapon/cartridge/cmo,
+ /obj/item/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown,
- /obj/item/device/radio/headset/heads/cmo,
+ /obj/item/radio/headset/heads/cmo,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/shoes/white)
/obj/structure/closet/secure_closet/CMO_wardrobe/Initialize()
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/medic
+ starts_with += /obj/item/storage/backpack/medic
else
- starts_with += /obj/item/weapon/storage/backpack/satchel/med
+ starts_with += /obj/item/storage/backpack/satchel/med
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
+ starts_with += /obj/item/storage/backpack/dufflebag/med
switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs
diff --git a/maps/yw/structures/closets/misc.dm b/maps/yw/structures/closets/misc.dm
index cac1067327..80de8b24ed 100644
--- a/maps/yw/structures/closets/misc.dm
+++ b/maps/yw/structures/closets/misc.dm
@@ -5,7 +5,7 @@
req_one_access = list(access_armory,access_captain)
starts_with = list(
- /obj/item/weapon/gun/energy/gun = 4)
+ /obj/item/gun/energy/gun = 4)
/obj/structure/closet/secure_closet/guncabinet/rifle
@@ -14,13 +14,13 @@
starts_with = list(
/obj/item/ammo_magazine/clip/c762/hunter = 9,
- /obj/item/weapon/gun/projectile/shotgun/pump/rifle = 2)
+ /obj/item/gun/projectile/shotgun/pump/rifle = 2)
/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize()
if(prob(85))
- starts_with += /obj/item/weapon/gun/projectile/shotgun/pump/rifle
+ starts_with += /obj/item/gun/projectile/shotgun/pump/rifle
else
- starts_with += /obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever
+ starts_with += /obj/item/gun/projectile/shotgun/pump/rifle/lever
return ..()
/obj/structure/closet/secure_closet/guncabinet/phase
@@ -28,8 +28,8 @@
req_one_access = list(access_explorer,access_brig)
starts_with = list(
- /obj/item/weapon/gun/energy/phasegun = 2,
- /obj/item/weapon/cell/device/weapon = 2,
+ /obj/item/gun/energy/phasegun = 2,
+ /obj/item/cell/device/weapon = 2,
/obj/item/clothing/accessory/permit/gun/planetside)
//Explorer Lockers
@@ -42,33 +42,33 @@
/obj/item/clothing/under/explorer,
/obj/item/clothing/suit/storage/hooded/explorer,
/obj/item/clothing/mask/gas/explorer,
- /obj/item/weapon/storage/belt/explorer,
+ /obj/item/storage/belt/explorer,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
- /obj/item/device/radio/headset/explorer,
- /obj/item/device/radio/headset/explorer/alt,
- /obj/item/weapon/cartridge/explorer,
- /obj/item/device/flashlight,
- /obj/item/device/gps/explorer,
- /obj/item/weapon/storage/box/flare,
- /obj/item/device/geiger,
- /obj/item/weapon/cell/device,
- /obj/item/device/radio,
+ /obj/item/radio/headset/explorer,
+ /obj/item/radio/headset/explorer/alt,
+ /obj/item/cartridge/explorer,
+ /obj/item/flashlight,
+ /obj/item/gps/explorer,
+ /obj/item/storage/box/flare,
+ /obj/item/geiger,
+ /obj/item/cell/device,
+ /obj/item/radio,
/obj/item/stack/marker_beacon/thirty,
- /obj/item/weapon/material/knife/tacknife/survival,
- /obj/item/weapon/material/knife/machete,
+ /obj/item/material/knife/tacknife/survival,
+ /obj/item/material/knife/machete,
/obj/item/clothing/accessory/holster/machete,
- /obj/item/weapon/reagent_containers/food/snacks/liquidfood,
- /obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
- /obj/item/device/cataloguer)
+ /obj/item/reagent_containers/food/snacks/liquidfood,
+ /obj/item/reagent_containers/food/snacks/liquidprotein,
+ /obj/item/cataloguer)
/obj/structure/closet/secure_closet/explorer/Initialize()
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/explorer
+ starts_with += /obj/item/storage/backpack/explorer
else
- starts_with += /obj/item/weapon/storage/backpack/satchel/explorer
+ starts_with += /obj/item/storage/backpack/satchel/explorer
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/dufflebag/explorer
+ starts_with += /obj/item/storage/backpack/dufflebag/explorer
return ..()
//SAR Lockers
@@ -79,44 +79,44 @@
req_access = list(access_fieldmedic)
starts_with = list(
- /obj/item/weapon/storage/backpack/dufflebag/emt,
- /obj/item/weapon/storage/box/autoinjectors,
- /obj/item/weapon/storage/box/syringes,
- /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
- /obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
- /obj/item/weapon/storage/belt/medical/emt,
+ /obj/item/storage/backpack/dufflebag/emt,
+ /obj/item/storage/box/autoinjectors,
+ /obj/item/storage/box/syringes,
+ /obj/item/reagent_containers/glass/bottle/inaprovaline,
+ /obj/item/reagent_containers/glass/bottle/antitoxin,
+ /obj/item/storage/belt/medical/emt,
/obj/item/clothing/mask/gas/explorer,
/obj/item/clothing/suit/storage/hooded/explorer/medic,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar,
/obj/item/clothing/shoes/boots/winter/explorer,
- /obj/item/device/radio/headset/sar,
- /obj/item/device/radio/headset/sar/alt,
- /obj/item/weapon/cartridge/sar,
- /obj/item/device/flashlight,
- /obj/item/weapon/tank/emergency/oxygen/engi,
+ /obj/item/radio/headset/sar,
+ /obj/item/radio/headset/sar/alt,
+ /obj/item/cartridge/sar,
+ /obj/item/flashlight,
+ /obj/item/tank/emergency/oxygen/engi,
/obj/item/clothing/glasses/hud/health,
- /obj/item/device/healthanalyzer,
- /obj/item/device/radio/off,
+ /obj/item/healthanalyzer,
+ /obj/item/radio/off,
/obj/random/medical,
- /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2,
- /obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 2,
- /obj/item/weapon/tool/crowbar,
- /obj/item/weapon/extinguisher/mini,
- /obj/item/weapon/storage/box/freezer,
+ /obj/item/reagent_containers/food/snacks/liquidfood = 2,
+ /obj/item/reagent_containers/food/snacks/liquidprotein = 2,
+ /obj/item/tool/crowbar,
+ /obj/item/extinguisher/mini,
+ /obj/item/storage/box/freezer,
/obj/item/clothing/accessory/storage/white_vest,
/obj/item/taperoll/medical,
- /obj/item/device/gps/medical,
- /obj/item/device/geiger,
+ /obj/item/gps/medical,
+ /obj/item/geiger,
/obj/item/bodybag/cryobag,
- /obj/item/device/cataloguer/compact)
+ /obj/item/cataloguer/compact)
/obj/structure/closet/secure_closet/sar/Initialize()
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/medic
+ starts_with += /obj/item/storage/backpack/medic
else
- starts_with += /obj/item/weapon/storage/backpack/satchel/med
+ starts_with += /obj/item/storage/backpack/satchel/med
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
+ starts_with += /obj/item/storage/backpack/dufflebag/med
return ..()
//Pilot Locker
@@ -126,8 +126,8 @@
req_access = list(access_pilot)
starts_with = list(
- /obj/item/weapon/storage/backpack/parachute,
- /obj/item/weapon/material/knife/tacknife/survival,
+ /obj/item/storage/backpack/parachute,
+ /obj/item/material/knife/tacknife/survival,
/obj/item/clothing/head/pilot,
/obj/item/clothing/under/rank/pilot1,
/obj/item/clothing/suit/storage/toggle/bomber/pilot,
@@ -135,22 +135,22 @@
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/shoes/black,
/obj/item/clothing/gloves/fingerless,
- /obj/item/device/radio/headset/pilot,
- /obj/item/device/radio/headset/pilot/alt,
- /obj/item/device/flashlight,
- /obj/item/weapon/reagent_containers/food/snacks/liquidfood,
- /obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
- /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
- /obj/item/weapon/storage/box/flare,
- /obj/item/weapon/cell/device,
- /obj/item/device/radio,
- /obj/item/device/gps/explorer)
+ /obj/item/radio/headset/pilot,
+ /obj/item/radio/headset/pilot/alt,
+ /obj/item/flashlight,
+ /obj/item/reagent_containers/food/snacks/liquidfood,
+ /obj/item/reagent_containers/food/snacks/liquidprotein,
+ /obj/item/reagent_containers/food/drinks/cans/waterbottle,
+ /obj/item/storage/box/flare,
+ /obj/item/cell/device,
+ /obj/item/radio,
+ /obj/item/gps/explorer)
/obj/structure/closet/secure_closet/pilot/Initialize()
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack
+ starts_with += /obj/item/storage/backpack
else
- starts_with += /obj/item/weapon/storage/backpack/satchel/norm
+ starts_with += /obj/item/storage/backpack/satchel/norm
return ..()
//Exotic Seeds Crate
diff --git a/maps/yw/structures/closets/misc_vr.dm b/maps/yw/structures/closets/misc_vr.dm
index 473bdb2743..d56385d0fe 100644
--- a/maps/yw/structures/closets/misc_vr.dm
+++ b/maps/yw/structures/closets/misc_vr.dm
@@ -7,63 +7,63 @@
/obj/item/clothing/mask/gas/explorer,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
- /obj/item/device/radio/headset/explorer,
- /obj/item/device/flashlight,
- /obj/item/device/gps/explorer,
- /obj/item/weapon/storage/box/flare,
- /obj/item/device/geiger,
- /obj/item/weapon/cell/device,
- /obj/item/device/radio,
+ /obj/item/radio/headset/explorer,
+ /obj/item/flashlight,
+ /obj/item/gps/explorer,
+ /obj/item/storage/box/flare,
+ /obj/item/geiger,
+ /obj/item/cell/device,
+ /obj/item/radio,
/obj/item/stack/marker_beacon/thirty,
- /obj/item/weapon/material/knife/tacknife/survival,
- /obj/item/weapon/material/knife/machete,
+ /obj/item/material/knife/tacknife/survival,
+ /obj/item/material/knife/machete,
/obj/item/clothing/accessory/holster/machete,
- /obj/item/weapon/reagent_containers/food/snacks/liquidfood,
- /obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
- /obj/item/device/cataloguer)
+ /obj/item/reagent_containers/food/snacks/liquidfood,
+ /obj/item/reagent_containers/food/snacks/liquidprotein,
+ /obj/item/cataloguer)
/obj/structure/closet/secure_closet/sar
name = "field medic locker"
closet_appearance = /decl/closet_appearance/secure_closet/medical
starts_with = list(
- /obj/item/weapon/storage/backpack/dufflebag/emt,
- /obj/item/weapon/storage/box/autoinjectors,
- /obj/item/weapon/storage/box/syringes,
- /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
- /obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
- /obj/item/weapon/storage/belt/medical/emt,
- /obj/item/weapon/material/knife/tacknife/survival,
- /obj/item/weapon/gun/energy/locked/frontier/holdout,
+ /obj/item/storage/backpack/dufflebag/emt,
+ /obj/item/storage/box/autoinjectors,
+ /obj/item/storage/box/syringes,
+ /obj/item/reagent_containers/glass/bottle/inaprovaline,
+ /obj/item/reagent_containers/glass/bottle/antitoxin,
+ /obj/item/storage/belt/medical/emt,
+ /obj/item/material/knife/tacknife/survival,
+ /obj/item/gun/energy/locked/frontier/holdout,
/obj/item/clothing/mask/gas/explorer,
/obj/item/clothing/suit/storage/hooded/explorer/medic,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar,
/obj/item/clothing/shoes/boots/winter/explorer,
- /obj/item/device/radio/headset/sar,
- /obj/item/weapon/cartridge/medical,
- /obj/item/device/flashlight,
- /obj/item/weapon/tank/emergency/oxygen/engi,
+ /obj/item/radio/headset/sar,
+ /obj/item/cartridge/medical,
+ /obj/item/flashlight,
+ /obj/item/tank/emergency/oxygen/engi,
/obj/item/clothing/glasses/hud/health,
- /obj/item/device/healthanalyzer,
- /obj/item/device/radio/off,
+ /obj/item/healthanalyzer,
+ /obj/item/radio/off,
/obj/random/medical,
- /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2,
- /obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 2,
- /obj/item/weapon/tool/crowbar,
- /obj/item/weapon/extinguisher/mini,
- /obj/item/weapon/storage/box/freezer,
+ /obj/item/reagent_containers/food/snacks/liquidfood = 2,
+ /obj/item/reagent_containers/food/snacks/liquidprotein = 2,
+ /obj/item/tool/crowbar,
+ /obj/item/extinguisher/mini,
+ /obj/item/storage/box/freezer,
/obj/item/clothing/accessory/storage/white_vest,
/obj/item/taperoll/medical,
- /obj/item/device/gps/medical,
- /obj/item/device/geiger,
+ /obj/item/gps/medical,
+ /obj/item/geiger,
/obj/item/bodybag/cryobag,
- /obj/item/device/cataloguer/compact)
+ /obj/item/cataloguer/compact)
/obj/structure/closet/secure_closet/pilot
closet_appearance = /decl/closet_appearance/secure_closet/exploration/pilot
starts_with = list(
- /obj/item/weapon/storage/backpack/parachute,
- /obj/item/weapon/material/knife/tacknife/survival,
- /obj/item/weapon/gun/energy/locked/frontier/holdout,
+ /obj/item/storage/backpack/parachute,
+ /obj/item/material/knife/tacknife/survival,
+ /obj/item/gun/energy/locked/frontier/holdout,
/obj/item/clothing/head/pilot,
/obj/item/clothing/under/rank/pilot1,
/obj/item/clothing/suit/storage/toggle/bomber/pilot,
@@ -71,16 +71,16 @@
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/shoes/black,
/obj/item/clothing/gloves/fingerless,
- /obj/item/device/radio/headset/pilot/alt,
- /obj/item/device/flashlight,
- /obj/item/weapon/reagent_containers/food/snacks/liquidfood,
- /obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
- /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
- /obj/item/weapon/storage/box/flare,
- /obj/item/weapon/cell/device,
- /obj/item/device/radio,
- /obj/item/device/gps/explorer,
- /obj/item/device/cataloguer/compact)
+ /obj/item/radio/headset/pilot/alt,
+ /obj/item/flashlight,
+ /obj/item/reagent_containers/food/snacks/liquidfood,
+ /obj/item/reagent_containers/food/snacks/liquidprotein,
+ /obj/item/reagent_containers/food/drinks/cans/waterbottle,
+ /obj/item/storage/box/flare,
+ /obj/item/cell/device,
+ /obj/item/radio,
+ /obj/item/gps/explorer,
+ /obj/item/cataloguer/compact)
/obj/structure/closet/secure_closet/pathfinder
name = "pathfinder locker"
@@ -90,34 +90,34 @@
/obj/item/clothing/under/explorer,
/obj/item/clothing/suit/storage/hooded/explorer,
/obj/item/clothing/mask/gas/explorer,
- /obj/item/weapon/storage/belt/explorer/pathfinder,
+ /obj/item/storage/belt/explorer/pathfinder,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
- /obj/item/device/radio/headset/pathfinder,
- /obj/item/device/radio/headset/pathfinder/alt,
- /obj/item/weapon/cartridge/explorer,
- /obj/item/device/flashlight,
- /obj/item/device/gps/explorer,
- /obj/item/weapon/storage/box/flare,
- /obj/item/weapon/storage/box/explorerkeys,
- /obj/item/device/geiger,
- /obj/item/weapon/cell/device,
- /obj/item/device/radio,
- /obj/item/device/bluespaceradio/cryogaia_prelinked,
+ /obj/item/radio/headset/pathfinder,
+ /obj/item/radio/headset/pathfinder/alt,
+ /obj/item/cartridge/explorer,
+ /obj/item/flashlight,
+ /obj/item/gps/explorer,
+ /obj/item/storage/box/flare,
+ /obj/item/storage/box/explorerkeys,
+ /obj/item/geiger,
+ /obj/item/cell/device,
+ /obj/item/radio,
+ /obj/item/bluespaceradio/cryogaia_prelinked,
/obj/item/stack/marker_beacon/thirty,
- /obj/item/weapon/material/knife/tacknife/survival,
- /obj/item/weapon/material/knife/machete/deluxe,
- /obj/item/weapon/gun/energy/locked/frontier/carbine,
+ /obj/item/material/knife/tacknife/survival,
+ /obj/item/material/knife/machete/deluxe,
+ /obj/item/gun/energy/locked/frontier/carbine,
/obj/item/clothing/accessory/holster/machete,
/obj/random/explorer_shield,
- /obj/item/weapon/reagent_containers/food/snacks/liquidfood,
- /obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
- /obj/item/device/cataloguer/compact/pathfinder,
- /obj/item/device/mapping_unit)
+ /obj/item/reagent_containers/food/snacks/liquidfood,
+ /obj/item/reagent_containers/food/snacks/liquidprotein,
+ /obj/item/cataloguer/compact/pathfinder,
+ /obj/item/mapping_unit)
/obj/structure/closet/secure_closet/pathfinder/Initialize()
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack
+ starts_with += /obj/item/storage/backpack
else
- starts_with += /obj/item/weapon/storage/backpack/satchel/norm
+ starts_with += /obj/item/storage/backpack/satchel/norm
return ..()
diff --git a/maps/yw/structures/closets/research.dm b/maps/yw/structures/closets/research.dm
index 131877ce77..9c0f32e13d 100644
--- a/maps/yw/structures/closets/research.dm
+++ b/maps/yw/structures/closets/research.dm
@@ -13,8 +13,8 @@
/obj/item/clothing/under/rank/research_director/rdalt,
/obj/item/clothing/under/rank/research_director/dress_rd,
/obj/item/clothing/suit/storage/toggle/labcoat,
- /obj/item/weapon/cartridge/rd,
+ /obj/item/cartridge/rd,
/obj/item/clothing/shoes/white,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/gloves/sterile/latex,
- /obj/item/device/radio/headset/heads/rd)
+ /obj/item/radio/headset/heads/rd)
diff --git a/maps/yw/structures/closets/security.dm b/maps/yw/structures/closets/security.dm
index d0e6ab2fb6..bb5e0d5271 100644
--- a/maps/yw/structures/closets/security.dm
+++ b/maps/yw/structures/closets/security.dm
@@ -13,10 +13,10 @@
/obj/item/clothing/under/rank/head_of_security/corp,
/obj/item/clothing/suit/storage/vest/hoscoat/jensen,
/obj/item/clothing/suit/storage/vest/hoscoat,
- /obj/item/weapon/cartridge/hos,
- /obj/item/device/radio/headset/heads/hos,
+ /obj/item/cartridge/hos,
+ /obj/item/radio/headset/heads/hos,
/obj/item/clothing/glasses/sunglasses/sechud,
- /obj/item/weapon/storage/box/holobadge/hos,
+ /obj/item/storage/box/holobadge/hos,
/obj/item/clothing/accessory/badge/holo/hos,
/obj/item/clothing/accessory/holster/waist,
/obj/item/clothing/head/beret/sec/corporate/hos,
@@ -24,9 +24,9 @@
/obj/structure/closet/secure_closet/hos_wardrobe/Initialize()
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/security
+ starts_with += /obj/item/storage/backpack/security
else
- starts_with += /obj/item/weapon/storage/backpack/satchel/sec
+ starts_with += /obj/item/storage/backpack/satchel/sec
if(prob(50))
- starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
+ starts_with += /obj/item/storage/backpack/dufflebag/sec
return ..()
diff --git a/maps/yw/submaps/_cryogaia_submaps.dm b/maps/yw/submaps/_cryogaia_submaps.dm
index f8c7a5dce2..9e0661864c 100644
--- a/maps/yw/submaps/_cryogaia_submaps.dm
+++ b/maps/yw/submaps/_cryogaia_submaps.dm
@@ -26,7 +26,7 @@
//////////////////////////////////////////////////////////////////////////////
/// Away Missions
-#if AWAY_MISSION_TEST
+#ifdef AWAY_MISSION_TEST
#include "cryogaia_plains/cryogaia_plains.dmm"
#endif
@@ -62,7 +62,7 @@
//////////////////////////////////////////////////////////////////////////////////////
// Admin-use z-levels for loading whenever an admin feels like
-#if AWAY_MISSION_TEST
+#ifdef AWAY_MISSION_TEST
#include "admin_use/spa.dmm"
#endif
@@ -295,7 +295,7 @@
#include "../../offmap_vr/talon/talon_v2.dm"
#include "../../offmap_vr/talon/talon_v2_areas.dm"
-#if MAP_TEST
+#ifdef MAP_TEST
#include "../../offmap_vr/talon/talon_v2.dmm"
#endif
@@ -306,8 +306,8 @@
#include "../../offmap_vr/om_ships/screebarge.dm"
#include "../../offmap_vr/om_ships/aro.dm"
#include "../../offmap_vr/om_ships/aro2.dm"
+#include "../../offmap_vr/om_ships/aro3.dm"
#include "../../offmap_vr/om_ships/bearcat.dm"
-#include "../../offmap_vr/om_ships/cruiser.dm"
#include "../../offmap_vr/om_ships/vespa.dm"
#include "../../offmap_vr/om_ships/generic_shuttle.dm"
#include "../../offmap_vr/om_ships/salamander.dm"
@@ -318,11 +318,12 @@
#include "../../offmap_vr/om_ships/curashuttle.dm"
#include "../../offmap_vr/om_ships/itglight.dm"
#include "../../offmap_vr/om_ships/abductor.dm"
+#include "../../offmap_vr/om_ships/lunaship.dm"
+#include "../../offmap_vr/om_ships/sdf_corvettes.dm"
//////////////////////////////////////////////////////////////////////////////
//Capsule deployed ships
#include "../../offmap_vr/om_ships/shelter_5.dm"
-#include "../../offmap_vr/om_ships/shelter_6.dm"
// Talon offmap spawn
/datum/map_template/cryogaia_lateload/offmap/talon_v2
diff --git a/maps/yw/submaps/admin_ships/adminship.dm b/maps/yw/submaps/admin_ships/adminship.dm
index 8ecb3a51ea..1f370c5b3d 100644
--- a/maps/yw/submaps/admin_ships/adminship.dm
+++ b/maps/yw/submaps/admin_ships/adminship.dm
@@ -1,5 +1,5 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
#include "adminship.dmm"
#endif
@@ -97,4 +97,4 @@
docking_controller_tag = "adminshuttle_docker"
shuttle_area = /area/shuttle/adminshuttle
fuel_consumption = 0
- defer_initialisation = TRUE
\ No newline at end of file
+ defer_initialisation = TRUE
diff --git a/maps/yw/submaps/aerostat/submaps/virgo2.dm b/maps/yw/submaps/aerostat/submaps/virgo2.dm
index 757d314114..55c1023e03 100644
--- a/maps/yw/submaps/aerostat/submaps/virgo2.dm
+++ b/maps/yw/submaps/aerostat/submaps/virgo2.dm
@@ -1,6 +1,6 @@
#include "virgo2_submap_areas.dm"
-#if MAP_TEST
+#ifdef MAP_TEST
#include "Flake.dmm"
#include "MCamp1.dmm"
#include "Rocky1.dmm"
diff --git a/maps/yw/submaps/alienship/_alienship.dm b/maps/yw/submaps/alienship/_alienship.dm
index d4f574b4c2..2f77a40a3c 100644
--- a/maps/yw/submaps/alienship/_alienship.dm
+++ b/maps/yw/submaps/alienship/_alienship.dm
@@ -17,7 +17,7 @@
/obj/machinery/porta_turret/alien/ion
name = "interior anti-boarding turret"
desc = "A very tough looking turret made by alien hands."
- installation = /obj/item/weapon/gun/energy/ionrifle/weak
+ installation = /obj/item/gun/energy/ionrifle/weak
enabled = TRUE
lethal = TRUE
ailock = TRUE
@@ -57,7 +57,7 @@
icon_state = "w2e"
teleport_on_mode = "w2e"
-/obj/item/weapon/reagent_containers/hypospray/autoinjector/alien
+/obj/item/reagent_containers/hypospray/autoinjector/alien
name = "alien injector(?)"
desc = "It appears to contain some sort of liquid and has a needle for injecting."
icon = 'alienship.dmi'
diff --git a/maps/yw/submaps/underdark_pois/underdark_things.dm b/maps/yw/submaps/underdark_pois/underdark_things.dm
index 8826471ad9..9a3ea39727 100644
--- a/maps/yw/submaps/underdark_pois/underdark_things.dm
+++ b/maps/yw/submaps/underdark_pois/underdark_things.dm
@@ -105,13 +105,13 @@
/obj/random/multiple/underdark/miningdrills/item_to_spawn()
return pick(
- prob(10);list(/obj/item/weapon/pickaxe/silver),
- prob(8);list(/obj/item/weapon/pickaxe/drill),
- prob(6);list(/obj/item/weapon/pickaxe/jackhammer),
- prob(5);list(/obj/item/weapon/pickaxe/gold),
- prob(4);list(/obj/item/weapon/pickaxe/plasmacutter),
- prob(2);list(/obj/item/weapon/pickaxe/diamond),
- prob(1);list(/obj/item/weapon/pickaxe/diamonddrill)
+ prob(10);list(/obj/item/pickaxe/silver),
+ prob(8);list(/obj/item/pickaxe/drill),
+ prob(6);list(/obj/item/pickaxe/jackhammer),
+ prob(5);list(/obj/item/pickaxe/gold),
+ prob(4);list(/obj/item/pickaxe/plasmacutter),
+ prob(2);list(/obj/item/pickaxe/diamond),
+ prob(1);list(/obj/item/pickaxe/diamonddrill)
)
/obj/random/multiple/underdark/ores
@@ -123,84 +123,84 @@
/obj/random/multiple/underdark/ores/item_to_spawn()
return pick(
prob(9);list(
- /obj/item/weapon/storage/bag/ore,
- /obj/item/weapon/shovel,
- /obj/item/weapon/ore/glass,
- /obj/item/weapon/ore/glass,
- /obj/item/weapon/ore/glass,
- /obj/item/weapon/ore/glass,
- /obj/item/weapon/ore/glass,
- /obj/item/weapon/ore/glass,
- /obj/item/weapon/ore/glass,
- /obj/item/weapon/ore/glass,
- /obj/item/weapon/ore/glass,
- /obj/item/weapon/ore/glass,
- /obj/item/weapon/ore/hydrogen,
- /obj/item/weapon/ore/hydrogen,
- /obj/item/weapon/ore/hydrogen,
- /obj/item/weapon/ore/hydrogen,
- /obj/item/weapon/ore/hydrogen,
- /obj/item/weapon/ore/hydrogen
+ /obj/item/storage/bag/ore,
+ /obj/item/shovel,
+ /obj/item/ore/glass,
+ /obj/item/ore/glass,
+ /obj/item/ore/glass,
+ /obj/item/ore/glass,
+ /obj/item/ore/glass,
+ /obj/item/ore/glass,
+ /obj/item/ore/glass,
+ /obj/item/ore/glass,
+ /obj/item/ore/glass,
+ /obj/item/ore/glass,
+ /obj/item/ore/hydrogen,
+ /obj/item/ore/hydrogen,
+ /obj/item/ore/hydrogen,
+ /obj/item/ore/hydrogen,
+ /obj/item/ore/hydrogen,
+ /obj/item/ore/hydrogen
),
prob(7);list(
- /obj/item/weapon/storage/bag/ore,
- /obj/item/weapon/pickaxe,
- /obj/item/weapon/ore/osmium,
- /obj/item/weapon/ore/osmium,
- /obj/item/weapon/ore/osmium,
- /obj/item/weapon/ore/osmium,
- /obj/item/weapon/ore/osmium,
- /obj/item/weapon/ore/osmium,
- /obj/item/weapon/ore/osmium,
- /obj/item/weapon/ore/osmium,
- /obj/item/weapon/ore/osmium,
- /obj/item/weapon/ore/osmium
+ /obj/item/storage/bag/ore,
+ /obj/item/pickaxe,
+ /obj/item/ore/osmium,
+ /obj/item/ore/osmium,
+ /obj/item/ore/osmium,
+ /obj/item/ore/osmium,
+ /obj/item/ore/osmium,
+ /obj/item/ore/osmium,
+ /obj/item/ore/osmium,
+ /obj/item/ore/osmium,
+ /obj/item/ore/osmium,
+ /obj/item/ore/osmium
),
prob(4);list(
/obj/item/clothing/suit/radiation,
/obj/item/clothing/head/radiation,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium,
- /obj/item/weapon/ore/uranium),
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium,
+ /obj/item/ore/uranium),
prob(2);list(
- /obj/item/device/flashlight/lantern,
+ /obj/item/flashlight/lantern,
/obj/item/clothing/glasses/material,
- /obj/item/weapon/ore/diamond,
- /obj/item/weapon/ore/diamond,
- /obj/item/weapon/ore/diamond,
- /obj/item/weapon/ore/diamond,
- /obj/item/weapon/ore/diamond,
- /obj/item/weapon/ore/diamond,
- /obj/item/weapon/ore/diamond,
- /obj/item/weapon/ore/diamond,
- /obj/item/weapon/ore/diamond,
- /obj/item/weapon/ore/diamond
+ /obj/item/ore/diamond,
+ /obj/item/ore/diamond,
+ /obj/item/ore/diamond,
+ /obj/item/ore/diamond,
+ /obj/item/ore/diamond,
+ /obj/item/ore/diamond,
+ /obj/item/ore/diamond,
+ /obj/item/ore/diamond,
+ /obj/item/ore/diamond,
+ /obj/item/ore/diamond
),
prob(1);list(
- /obj/item/weapon/mining_scanner,
- /obj/item/weapon/shovel/spade,
- /obj/item/weapon/ore/verdantium,
- /obj/item/weapon/ore/verdantium,
- /obj/item/weapon/ore/verdantium,
- /obj/item/weapon/ore/verdantium,
- /obj/item/weapon/ore/verdantium
+ /obj/item/mining_scanner,
+ /obj/item/shovel/spade,
+ /obj/item/ore/verdantium,
+ /obj/item/ore/verdantium,
+ /obj/item/ore/verdantium,
+ /obj/item/ore/verdantium,
+ /obj/item/ore/verdantium
)
)
@@ -221,10 +221,10 @@
/obj/item/clothing/head/pirate
),
prob(4);list(
- /obj/item/weapon/storage/bag/cash,
- /obj/item/weapon/spacecash/c500,
- /obj/item/weapon/spacecash/c100,
- /obj/item/weapon/spacecash/c50
+ /obj/item/storage/bag/cash,
+ /obj/item/spacecash/c500,
+ /obj/item/spacecash/c100,
+ /obj/item/spacecash/c50
),
prob(3);list(
/obj/item/clothing/head/hardhat/orange,
diff --git a/maps/yw/yw_vrstuff/_vrmaps.dm b/maps/yw/yw_vrstuff/_vrmaps.dm
index febd95faf1..cf74fdca7b 100644
--- a/maps/yw/yw_vrstuff/_vrmaps.dm
+++ b/maps/yw/yw_vrstuff/_vrmaps.dm
@@ -1,4 +1,4 @@
-#if AWAY_MISSION_TEST
+#ifdef AWAY_MISSION_TEST
#include "vrmaps.dmm"
#endif
diff --git a/maps/~map_system/_map_selection.dm b/maps/~map_system/_map_selection.dm
index bfed76a2f5..41a2e23e1d 100644
--- a/maps/~map_system/_map_selection.dm
+++ b/maps/~map_system/_map_selection.dm
@@ -40,5 +40,5 @@
////YW
// Cryogaia
#ifdef USE_MAP_CRYOGAIA
-#include "../maps/yw/cryogaia.dm"
+#include "../yw/cryogaia.dm"
#endif
diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
index d763b15c7b..c14a17c066 100644
--- a/modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
+++ b/modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
@@ -41,7 +41,7 @@
if(istype(thing, /mob/living/carbon/human))
var/mob/living/carbon/human/watchers = thing
if(watchers in oviewers(7,src) && watchers.species != SPECIES_SHADEKIN) // And they can see us... //CHOMPEDIT - (And aren't themselves a shadekin)
- if(!(watchers.stat) && !isbelly(watchers.loc) && !istype(watchers.loc, /obj/item/weapon/holder)) // And they are alive and not being held by someone...
+ if(!(watchers.stat) && !isbelly(watchers.loc) && !istype(watchers.loc, /obj/item/holder)) // And they are alive and not being held by someone...
watcher++ // They are watching us!
else if(istype(thing, /mob/living/silicon/robot))
var/mob/living/silicon/robot/watchers = thing
diff --git a/modular_chomp/code/modules/telesci/bscrystal.dm b/modular_chomp/code/modules/telesci/bscrystal.dm
index 1d3d443a21..f82e1a3224 100644
--- a/modular_chomp/code/modules/telesci/bscrystal.dm
+++ b/modular_chomp/code/modules/telesci/bscrystal.dm
@@ -1,5 +1,5 @@
// This proc turns the BSC or arti-BSC into a phased-creature mine.
-/obj/item/weapon/bluespace_crystal/Crossed(atom/movable/M)
+/obj/item/bluespace_crystal/Crossed(atom/movable/M)
. = ..()
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
@@ -15,7 +15,7 @@
// This proc is the 'Dephase grenade' check. range is changeable. 0=self, 1=3x3, 2=5x5, 3=7x7...
-/obj/item/weapon/bluespace_crystal/proc/dephase_shadekin()
+/obj/item/bluespace_crystal/proc/dephase_shadekin()
var/turf/T = get_turf(src)
for(var/thing in range(3, T))
if(istype(thing, /mob/living/carbon/human))